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

Change-Id: Ib658b8762e7ebefc7798553351dbd150178458d2