Merge "Quick scrub has gradient follow user drag" into pi-dev