Merge "Fix bug that allowed avoiding lockout if too many wrong patterns are entered."