Merge "Refactor PickerSyncController methods" into sc-mainline-prod