Merge "WIP - Improves PIN/PUK handling events in keyguard"