Merge "Only show enabled/disabled filters in main app list" into nyc-dev