Merge "Don't stop scrolling if scroller reports 0 diff" into lmp-mr1-dev