Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev