Fix timeout issues related to UI sync.

Same non-blocking comment as above.