Merge "Take into account CMP feature flag in PhotoPicker tests" into tm-mainline-prod