Merge "Show the keyguard if unsecure window on top" into klp-modular-dev