Merge "overlay: Fix Keyguard configuration" into cm-11.0