Merge "Add multi-user support to Controls"