Merge "Fix Activity Transition mess-up." into nyc-dev