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

* commit 'f40628645df750991ced8dde803dd57225fca04f':
  Accessibility focus and input focus do not sync - part 2