Merge "Fix rule ownership check when notifying from a ConditionProviderService" into main