Merge "Update some UI in PhotoPicker" into sc-mainline-prod