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

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