Merge "Re-connect to the CDM service if process gets killed" into sc-dev