Merge "Add tracing to RemoteViews" into main