Merge "Avoid UserManager#isUserLocked"