Merge "Do not allow removing current user if it's in a call" into nyc-dev