Merge "Add NPE check in CameraTransitionCallback" into rvc-dev