Merge "Revert "Refreshes preference text when updateStates""

src/com/android/settings/core/TogglePreferenceController.java

@@ -54,9 +54,10 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle
             ((TwoStatePreference) preference).setChecked(isChecked());
         } else if (preference instanceof MasterSwitchPreference) {
             ((MasterSwitchPreference) preference).setChecked(isChecked());
-        }
+        } else {
             refreshSummary(preference);
         }
+    }
 
     @Override
     public final boolean onPreferenceChange(Preference preference, Object newValue) {