Merge "Fix empty keyguard for once and all" into mnc-dev