Merge "Fix fast scroller thumb and track margins for Material"