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

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