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

Change-Id: I40d9fb13190db81472cde320cccd9a868ea21516