Merge "Moving grid customization provider to Dagger" into main