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

Change-Id: I8e67ffc5dca20bf238d79cd66fc2a0eac144baf3