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

Change-Id: Ia800103ddfe332c1e1cc2fe50df98d90122fda8a