Merge "Update PhotoPickerTool for allow multiple behavior changed" into sc-mainline-prod