Merge "Support CDM-less virtual devices." into main