Merge "Trace registrations of content observers" into main