Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev