Merge "[CDM][Refactoring 6/N] Some device presence refactoring" into main