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