Merge "Remove tracing from quick affordances" into main