Merge "Avoid stopping scroller twice" into klp-modular-dev