cros: Prevent initial GAIA signin screen and kiosk splash from racing.

Bug: 872805
Change-Id: I16c0de6d930b26ad6400cc0580f73fc2404c92b3
Reviewed-on: https://chromium-review.googlesource.com/1171251
Commit-Queue: Quan Nguyen <qnnguyen@chromium.org>
Reviewed-by: David Jacobo <djacobo@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590424}

ui/login/display_manager.js

@@ -726,6 +726,19 @@ cr.define('cr.ui.login', function() {
       if (this.currentScreen.id == SCREEN_DEVICE_DISABLED)
         return;
 
+      // Prevent initial GAIA signin load from interrupting the kiosk splash
+      // screen.
+      // TODO: remove this special case when a better fix is found for the race
+      // condition. This if statement was introduced to fix http://b/113786350.
+      if ((this.currentScreen.id == SCREEN_APP_LAUNCH_SPLASH ||
+           this.currentScreen.id == SCREEN_ARC_KIOSK_SPLASH) &&
+          screen.id == SCREEN_GAIA_SIGNIN) {
+        console.log(
+            this.currentScreen.id +
+            ' screen showing. Ignoring switch to Gaia screen.');
+        return;
+      }
+
       var screenId = screen.id;
       if (screenId == SCREEN_ACCOUNT_PICKER && this.showingViewsLogin) {
         chrome.send('hideOobeDialog');