Merge "There are two computeHorizontalScrollRange() got missed in the last conversion."