Merge "Fix NullPointerException in UserController.forceStopUser" into main