Merge "[CDM][Refactoring 4/N] Move device presence logic out of CDMS" into main