Merge "Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c am: ff029854" into nyc-mr1-dev-plus-aosp