Merge "Accessiblity focus not following input focus and text nav broken." into jb-dev