Improve keyboard navigation

Bug:3189110
Change-Id: I4648b21a437f23cd032bf3900de160a841de5a8a
4 files changed