Merge "Add NPE check in CameraTransitionCallback" into rvc-dev am: 7695663db7 am: 65328168f1 am: 87b9886ccd am: 9aa3a0a731 am: 55fe0df14a

Change-Id: I4df9d14837390cf6bc9740098a5188a9cb1eabcc