Fix timeout issues related to UI sync.
Merge pull request #1592 from kbidarkar/fix-timeouts

Fix timeout issues related to UI sync.