Merge "Fix Keyguard drawn timeout" into mnc-dev