Merge "Add NPE chceck in CameraTransitionCallback" into rvc-dev am: dc711d9c am: 16257b10 am: f7273781 Change-Id: I602c99047a863780dc19515c55b3671f67e1a162