Merge "Align settings seekbar to match other preferences" into oc-dev
am: 532a88dcd0

Change-Id: I32e55dbc14a1da1237d7cee061b832524954c56f