Merge "Make the ToggleSlider in the status bar settings panel show the right track when it's disabled."