Merge "Fix keyguard pattern invalidate bug" into jb-mr2-dev