Merge "Fix NPE in LockPatternUtils"