Fix logic when enabling buildkit Upstream-commit: ef50da44b30dd041896cfc6be45b777e10cc1d75 Component: engine