Merge "Fix a bug where the fast scroll track would be positioned incorrectly."