Merge "Enable PhotoPicker APIs" into sc-mainline-prod