Merge "Enhancing keyboard navigation performance" into nyc-dev