Merge "Fix NPE in RemoteTransitionCompat" into sc-v2-dev