Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev