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

* commit '8074e98b20ac04fdc032a1ed00dd6763b7e04147':
  Fix crashes when quickly adding and removing users