And pass it through to bus_wait_for_jobs() (cherry picked from commit 86980de6) (cherry picked from commit 0c4fe2e3) (cherry picked from commit 84188acc)