Merge "Add UI-disabled tests for UserController"