Merge "Fix broken homekey on devices without keyguard" into klp-modular-dev