Merge "Revert "Add tracing to RemoteViews"" into main