Merge "Initial support for keyboard navigation"