Merge "Make SeekBar 1dp tall when disabled" into rvc-dev