am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev

* commit '876f95ed7f914b4d86634db552277f835d288805':
  Update references to migrated global settings.
  Handle user switched for settings changes.
tree: 817aeddfbb613e791217aff06fccd9b3dae075b6
  1. core/
  2. services/