Merge "Improve support for external keyboards."