Merge "Ensure to complete background thread of PipeManager." into nyc-dev