Merge "Fix virtual input device creation timeouts"