Merge "SeekBarPreference -> SeekBarDialogPreference"