MD Settings: Display: Fix selected display update

chrome/browser/resources/settings/device_page/display.js

Index: chrome/browser/resources/settings/device_page/display.js
diff --git a/chrome/browser/resources/settings/device_page/display.js b/chrome/browser/resources/settings/device_page/display.js
index 31e25c81631220715146a2a2600aa36d837f94e8..d1ee75acdd7e449b3c23c4783c884d2b6254cf52 100644
--- a/chrome/browser/resources/settings/device_page/display.js
+++ b/chrome/browser/resources/settings/device_page/display.js
@@ -296,8 +296,13 @@ Polymer({
       var display = this.displays[i];
       if (id != display.id)
         continue;
-      this.currentSelectedModeIndex_ = -1;
-      this.selectedDisplay = display;
+      if (this.selectedDisplay != display) {
+        // Set currentSelectedModeIndex_ to -1 so that getResolutionText_ does
+        // not flicker. selectedDisplayChanged will update selectedModeIndex_
+        // and currentSelectedModeIndex_ correctly.
+        this.currentSelectedModeIndex_ = -1;
+        this.selectedDisplay = display;
+      }
     }
   },