Merge "Add external volume names to PhotoPicker media collection id" into sc-mainline-prod