Merge "Add an option to open the PhotoPicker in the specified tab" into udc-mainline-prod