Merge "Make Settings Slider Slices one row" into pi-dev
am: 4199198ec2

Change-Id: I3716adf421c539c4a4f0617a5ab8d1a1f89e7cbc