Merge commit 'c6d83cafed6e60223c28da328f845998e27bfae0' * commit 'c6d83cafed6e60223c28da328f845998e27bfae0': Fix a bug that could cause flings to last too long using a Scroller
Merge commit 'c6d83cafed6e60223c28da328f845998e27bfae0' * commit 'c6d83cafed6e60223c28da328f845998e27bfae0': Fix a bug that could cause flings to last too long using a Scroller