Merge "Introduce CDM device presence base on UUID" into main