Merge "minui/drm: wait for page flip completion" am: d419966730 am: d3e023c265
am: cb482213b4

Change-Id: I0695b0167adb962b860e69d59c684521bada1d5a