Merge "Add NPE check in CameraTransitionCallback" into rvc-dev am: 7695663db7 am: 0dcdf29fad am: 1f57fca27e am: c5aa83d1d5

Change-Id: I8d876e9af5b6f76be22ed7f73c12e9ec768faa3a