Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev