Merge "Permission Hub opens properly from Keyguard"