Merge "Actually wait until the display is ready." into oc-dev