Merge "Refactor PickerSyncController to cache the cloud provider uid" into sc-mainline-prod