am 4ce106f5: Merge "Fixing some minor issues in accessibility focus." into jb-dev

* commit '4ce106f5cff5670bf1aae4190612dc8e972f5c28':
  Fixing some minor issues in accessibility focus.