Merge "Remove switching from Users menu" into nyc-dev