Merge "Remove user state in onUserRemoved"