Merge "Add PhotoPicker Settings Intent" into sc-mainline-prod