Merge "Accessibility focus and input focus do not sync - part 2" into jb-dev