Merge "Don't hold the CPH lock while installing providers." into sc-dev