Merge "Fixing some minor issues in accessibility focus." into jb-dev