am d6bcda99: am 02b4caf5: am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev

* commit 'd6bcda99b062eb0bb8511d7a4a1cefc23df3cb77':
  Fix issue #17811029: Settings provider race when removing users