Merge "Update the camera permission icon" into sc-dev