Merge "Add PhotoPickerTool" into sc-mainline-prod