Merge "Enable PhotoPicker tests for test-coverage" into sc-mainline-prod