Merge "Revert "Improve ImageFloatingTextView Tracing"" into main