Merge "Fixing a regression in the UI test automation." into jb-mr1-dev