Merge "Tweak quickscrub bar visuals" into pi-dev