Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev