Merge "Fix phishing attack in ChooseLockGeneric"