Merge "Don't store a static instance of UserManager"