Merge "Preserve other windows during resize as well."

                if (r != null && !deferResume) {

                    kept = r.ensureActivityConfiguration(0 /* globalChanges */,

                            preserveWindow);

                    // Preserve other windows for resizing because if resizing happens when there

                    // is a dialog activity in the front, the activity that still shows some

                    // content to the user will become black and cause flickers. Note in most cases

                    // this won't cause tons of irrelevant windows being preserved because only

                    // activities in this task may experience a bounds change. Configs for other

                    // activities stay the same.

                    mService.mStackSupervisor.ensureActivitiesVisibleLocked(r, 0,

                            !PRESERVE_WINDOWS);

                            preserveWindow);

                    if (!kept) {

                        mService.mStackSupervisor.resumeFocusedStackTopActivityLocked();

                    }