Merge "Revert "Fix for Overlapping Time Text UI"" into main