Merge "Improve handling of certain keyboard layout properties."