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

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