Merge "Clean up KeyboardLayoutSet a bit"