[NTP] Fix double selection on upload and no background tiles

Bug: 996587
Change-Id: I30894289635cfb232b36394d1a4e861455b86f96
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764905
Commit-Queue: Kyle Milka <kmilka@chromium.org>
Reviewed-by: Kristi Park <kristipark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689744}

chrome/browser/resources/local_ntp/customize.js

@@ -402,6 +402,9 @@ customize.clearAttribution = function() {
 };
 
 customize.unselectTile = function() {
+  if (configData.richerPicker) {
+    return;
+  }
   $(customize.IDS.DONE).disabled = true;
   customize.selectedOptions.background = null;
   $(customize.IDS.DONE).tabIndex = -1;
@@ -969,8 +972,7 @@ customize.richerPicker_selectBackgroundTile = function(tile) {
     return;
   }
 
-  if (customize.selectedOptions.background &&
-      customize.selectedOptions.background.id == tile.id) {
+  if (tile.parentElement.classList.contains(customize.CLASSES.SELECTED)) {
     // If the clicked tile is already selected do nothing.
     return;
   } else if (customize.selectedOptions.background) {