Merge "Moving widgetFilter to dagger" into main