Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a

Change-Id: I2a515c65bfb4d57b832422f60507050c7a64c2aa

src/com/android/settings/users/EditUserInfoController.java

@@ -83,8 +83,7 @@ public class EditUserInfoController {
     }
 
     public void onSaveInstanceState(Bundle outState) {
-        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
-                && mEditUserPhotoController != null) {
+        if (mEditUserInfoDialog != null && mEditUserPhotoController != null) {
             // Bitmap cannot be stored into bundle because it may exceed parcel limit
             // Store it in a temporary file instead
             File file = mEditUserPhotoController.saveNewUserPhotoBitmap();