Merge "Reduce WTF for user-still-locked case"