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

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