Merge "Enable dagger for sysui"