Merge "Increase timeout for waiting for physical interfaces to show up" into main