Merge "Add VDMInternal API getAllPersistentDeviceIds" into main