Merge "Revert^2 "Improve ImageFloatingTextView Tracing"" into main