Merge "Accessibility focus should not clear selection when taken away." into jb-dev