Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev