Merge "Replace slider with switches; move slider to tuner." into nyc-dev