Merge "Fix service found callback on subtype update" into main