Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev