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

Change-Id: I57cf675a23fb4b0dae376859f4ceddb8f252405c