UI: fixes for various automation failures
Merge pull request #1120 from kbidarkar/fix-automation-tests33

UI: fixes for various automation failures