Merge "Destroy activity in onStop()" into udc-dev

src/com/android/settings/password/ChooseLockGeneric.java

@@ -815,6 +815,14 @@ public class ChooseLockGeneric extends SettingsActivity {
             return intent;
         }
 
+        @Override
+        public void onStop() {
+            super.onStop();
+            if (!getActivity().isChangingConfigurations() && !mWaitingForConfirmation) {
+                getActivity().finish();
+            }
+        }
+
         @Override
         public void onDestroy() {
             super.onDestroy();