Merge "Split Activity Transitions out of PhoneWindow."