Merge "Fix NPE on RemoteAnimationTargetCompat" into sc-dev