Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev