Merge "Remove inline settings slider." into nyc-dev