Merge "Pull background executor back to pm.injector"