Merge "Add Coordinators to replace NotificationFilter"