Merge "Camera: Catch SecurityException for UID state changes" into main