Merge "Fix issue where Keyguard would not be dismissed"