Merge "Set focused activity when moving task fullscreen."

            // Apps may depend on onResume()/onPause() being called in pairs.

            if (wasResumed) {

                stack.mResumedActivity = r;

            }

            // move the stack in which we are placing the task to the front.

                // Move the stack in which we are placing the task to the front. We don't use

                // ActivityManagerService.setFocusedActivityLocked, because if the activity is

                // already focused, the call will short-circuit and do nothing.

                stack.moveToFront(reason);

            } else {

                // We need to not only move the stack to the front, but also have the activity

                // focused. This will achieve both goals.

                mService.setFocusedActivityLocked(r, reason);

            }

        }

        return stack;