Merge "Fix SystemUI for dagger 2.47" into main