Fixed scroll and set inertial 0
Merge branch 'fix-scroll' into develop