Merge "Show fewer filters on notifications page." into nyc-dev