Keep CrOS OOBE user image grid from stealing focus from the OK button

chrome/browser/resources/chromeos/user_images_grid.js

Index: chrome/browser/resources/chromeos/user_images_grid.js
diff --git a/chrome/browser/resources/chromeos/user_images_grid.js b/chrome/browser/resources/chromeos/user_images_grid.js
index def7d3bfa1e3504ed8711cec7236178285683c0e..36a8902e49a0f0459a0261cd2fae12b02b87d0c9 100644
--- a/chrome/browser/resources/chromeos/user_images_grid.js
+++ b/chrome/browser/resources/chromeos/user_images_grid.js
@@ -329,7 +329,10 @@ cr.define('options', function() {
         this.removeItem(this.cameraImage_);
         this.cameraImage_ = null;
       }
-      this.focus();
+
+      // Set focus to the grid, unless focus is on the OK button.
+      if (!document.activeElement || document.activeElement.tagName != 'BUTTON')
+        this.focus();
     },
 
     /**