Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev