Merge "Make prefs without an action unselectable" into nyc-dev