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

Change-Id: I7428ae92d9f080abb7a3e3106ad017ff242288ee