Merge "Fix NPE in ChooseLockPattern"