Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev