Merge "Fix text jumping from one line -> two line when scrolling" into main