Fixed a bug where the scroller would stop tracking
am: ecfc6b52ec

Change-Id: I3f8cfbaa26a90f62246fb5161e4b4cc853a9832c