Merge "UI test automation service should not be auto reconnected." into jb-mr1-dev