fix - change button color now doesn't affect scrubber
Merge remote-tracking branch 'origin/2.9-May-18' into 2.9-May-18