Merge "Reconcile timeouts in virtual display tests"