Merge "UserController: simplify and fix the delayed user unlocking logic"