Merge "Add NPE check in CameraTransitionCallback" into rvc-dev am: 7695663db7 am: 65328168f1 am: 70617d340e am: 94b3056bcb

Change-Id: I19c15461528c0a2834c249fb874df92d85477664