Merge "UI test automation not working." into jb-dev