Merge "Break direct calls to UserController object in AMS from activity classes (12/n)"