[cros] OOBE avatar picker fixes and polishing.

chrome/browser/resources/chromeos/login/oobe_screen_user_image.js

Index: chrome/browser/resources/chromeos/login/oobe_screen_user_image.js
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js
index cd6829495fc174b9c6bee76b4ce5a07fbf92811b..e858621a631fb3f9ecb554eb17cd9f4e00698bcb 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js
@@ -286,7 +286,6 @@ cr.define('oobe', function() {
     },
 
     /**
-<<<<<<< HEAD
      * Appends default images to the image grid. Should only be called once.
      * @param {Array.<{url: string, author: string, website: string,
      *     title: string}>} images An array of default images data,
@@ -376,6 +375,7 @@ cr.define('oobe', function() {
             el.id = 'profile-image';
           });
       this.profileImage_.type = 'profile';
+      this.profileImageLoading = true;
 
       // Add camera stream element.
       imageGrid.cameraImage = null;