Merge "Fix overlapping timeline indicator"