Merge "Align settings seekbar to match other preferences" into oc-dev