Merge "[Settings] Align volume slider with other preference" into pi-dev