Merge "Prevent premature display of starting window." into oc-dev
am: f1a00e2b17

Change-Id: Ief49f064ef7de0ea8decd6a3bd73ed63553b61ae