Merge "Fix for Overlapping Time Text UI" into main