Merge "Keyguard debug flags"