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

Change-Id: If985d418af3dae02bff7c40cdb30051c8eaaf7ab