Merge "Prevent LinearSmoothScroller going too fast" into mnc-ub-dev