Merge "Prevent loop in PermissionPolicyService" into qt-dev