Merge "Protect GrantCredentialsPermissionActivity against overlay."