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