Merge "Tweak quickscrub bar visuals" into pi-dev
am: e2b602018f

Change-Id: Ie1cc36c9aaa35641deac620d7e5df50c9fc4e033