Merge "Revert "Revert "Have AMS.setFocusedActivityLocked() move the focus stack to the front"""