Merge changes from topic "refactor-picker"

* changes:
  [automerge] Refactor PickerSyncController methods 2p: 9e86327686
  Refactor PickerSyncController methods