Merge "Quick scrub has gradient follow user drag" into pi-dev
am: 5f5c6e993f

Change-Id: I173202bab30b6b8b5c45d1841a5070cb0d282a04