Merge "Fix CDM device disconnected callback immediately triggering "device disappeared"" into sc-dev