Merge "fix nullpointer when take picture during camera switch" into camera-SnapdragonCamera.lnx.2.0