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

Change-Id: Ib0aa0b6ad410f6356954e7f0fff322e511807f89