Merge "Enhancing keyboard navigation performance" into nyc-dev
am: ce46dd823a

* commit 'ce46dd823a1987fcee4a1e11a9b14bba1a4a86de':
  Enhancing keyboard navigation performance