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