resolve merge conflicts of 67e87fa to nyc-mr1-dev

Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178

src/com/android/settings/SettingsActivity.java

@@ -425,15 +425,6 @@ public class SettingsActivity extends SettingsDrawerActivity
         Index.getInstance(this).update();
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-
-        if (mNeedToRevertToInitialFragment) {
-            revertToInitialFragment();
-        }
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (!mDisplaySearch) {
@@ -776,8 +767,12 @@ public class SettingsActivity extends SettingsDrawerActivity
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
+    protected void onStart() {
+        super.onStart();
+
+        if (mNeedToRevertToInitialFragment) {
+            revertToInitialFragment();
+        }
 
         mDevelopmentPreferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
@@ -801,8 +796,8 @@ public class SettingsActivity extends SettingsDrawerActivity
     }
 
     @Override
-    protected void onPause() {
-        super.onPause();
+    protected void onStop() {
+        super.onStop();
         unregisterReceiver(mBatteryInfoReceiver);
         unregisterReceiver(mUserAddRemoveReceiver);
         mDynamicIndexableContentMonitor.unregister();