Merge "Refactor startIntentAndTaskWithLegacyTransition"