Merge "Fix DO check on headless devices" into main