Merge "Clear the EnterTransitionCoordinator only after onResume."