Merge "Use a polling check when waiting for a specific device" into main