am 6483f6d5: am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early

Merge commit '6483f6d546655a9579670b42d445614cab609e28' into kraken

* commit '6483f6d546655a9579670b42d445614cab609e28':
  Fix bug 2639949 - Don't stop a Scroller early