Merge "Actually wait until the display is ready." into oc-dev
am: 496267f93b

Change-Id: I41bf93f65c215cc841485c7570c7a7e78a0fdf93