Merge "Add tracing for registration/deregistration of ContentObservers" into main