Merge "Follow-up to empty keyguard issue" into mnc-dev