am 283d1409: am f624d72c: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev

* commit '283d1409ddadd35cd41b5496659d3a24dc365fb0':
  Fix crashes when quickly adding and removing users