diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 6f4e602..ab9b13e 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -77,7 +77,7 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name=".setup.LauncherIconVisibilityManager">
+        <receiver android:name="SystemBroadcastReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/java/res/values-bn-rBD/strings-action-keys.xml b/java/res/values-bn-rBD/strings-action-keys.xml
new file mode 100644
index 0000000..ca2e0eb
--- /dev/null
+++ b/java/res/values-bn-rBD/strings-action-keys.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label_go_key" msgid="4033615332628671065">"যান"</string>
+    <string name="label_next_key" msgid="5586407279258592635">"পরবর্তী"</string>
+    <string name="label_previous_key" msgid="1421141755779895275">"পূর্ববর্তী"</string>
+    <string name="label_done_key" msgid="7564866296502630852">"সম্পন্ন"</string>
+    <string name="label_send_key" msgid="482252074224462163">"পাঠান"</string>
+    <string name="label_search_key" msgid="7965186050435796642">"সন্ধান"</string>
+    <string name="label_pause_key" msgid="2225922926459730642">"বিরাম"</string>
+    <string name="label_wait_key" msgid="5891247853595466039">"অপেক্ষা করুন"</string>
+</resources>
diff --git a/java/res/values-bn-rBD/strings-appname.xml b/java/res/values-bn-rBD/strings-appname.xml
new file mode 100644
index 0000000..8efa51e
--- /dev/null
+++ b/java/res/values-bn-rBD/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_name" msgid="5940510615957428904">"Android কীবোর্ড (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"Android বানান পরীক্ষক (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"Android কীবোর্ড সেটিংস (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android বানান পরীক্ষক সেটিংস (AOSP)"</string>
+</resources>
diff --git a/java/res/values-bn-rBD/strings-config-important-notice.xml b/java/res/values-bn-rBD/strings-config-important-notice.xml
new file mode 100644
index 0000000..9bc815c
--- /dev/null
+++ b/java/res/values-bn-rBD/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"পরামর্শ উন্নত করতে আপনার যোগাযোগসমূহ এবং টাইপ করা তথ্য থেকে শিখুন"</string>
+</resources>
diff --git a/java/res/values-eu-rES/strings-action-keys.xml b/java/res/values-eu-rES/strings-action-keys.xml
new file mode 100644
index 0000000..1fba550
--- /dev/null
+++ b/java/res/values-eu-rES/strings-action-keys.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label_go_key" msgid="4033615332628671065">"Joan"</string>
+    <string name="label_next_key" msgid="5586407279258592635">"Aurrera"</string>
+    <string name="label_previous_key" msgid="1421141755779895275">"Atzera"</string>
+    <string name="label_done_key" msgid="7564866296502630852">"Eginda"</string>
+    <string name="label_send_key" msgid="482252074224462163">"Bidali"</string>
+    <string name="label_search_key" msgid="7965186050435796642">"Bilatu"</string>
+    <string name="label_pause_key" msgid="2225922926459730642">"Pausatu"</string>
+    <string name="label_wait_key" msgid="5891247853595466039">"Itxaron"</string>
+</resources>
diff --git a/java/res/values-eu-rES/strings-appname.xml b/java/res/values-eu-rES/strings-appname.xml
new file mode 100644
index 0000000..41ec09b
--- /dev/null
+++ b/java/res/values-eu-rES/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_name" msgid="5940510615957428904">"Android teklatua (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"Android zuzentzaile ortografikoa (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"Android teklatuaren ezarpenak (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android zuzentzaile ortografikoaren ezarpenak (AOSP)"</string>
+</resources>
diff --git a/java/res/values-eu-rES/strings-config-important-notice.xml b/java/res/values-eu-rES/strings-config-important-notice.xml
new file mode 100644
index 0000000..83d8fe5
--- /dev/null
+++ b/java/res/values-eu-rES/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"Iradokizunak hobetzeko, ikasi komunikazioetatik eta idazten duzunetik"</string>
+</resources>
diff --git a/java/res/values-gl-rES/strings-action-keys.xml b/java/res/values-gl-rES/strings-action-keys.xml
new file mode 100644
index 0000000..5ce96e6
--- /dev/null
+++ b/java/res/values-gl-rES/strings-action-keys.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label_go_key" msgid="4033615332628671065">"Ir"</string>
+    <string name="label_next_key" msgid="5586407279258592635">"Seg."</string>
+    <string name="label_previous_key" msgid="1421141755779895275">"Ant"</string>
+    <string name="label_done_key" msgid="7564866296502630852">"Feito"</string>
+    <string name="label_send_key" msgid="482252074224462163">"Enviar"</string>
+    <string name="label_search_key" msgid="7965186050435796642">"Buscar"</string>
+    <string name="label_pause_key" msgid="2225922926459730642">"Pausa"</string>
+    <string name="label_wait_key" msgid="5891247853595466039">"Espera"</string>
+</resources>
diff --git a/java/res/values-gl-rES/strings-appname.xml b/java/res/values-gl-rES/strings-appname.xml
new file mode 100644
index 0000000..df9e1f4
--- /dev/null
+++ b/java/res/values-gl-rES/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_name" msgid="5940510615957428904">"Teclado Android (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"Corrector ortográfico Android (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"Configuración do teclado Android (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Configuración do corrector ortográfico Android (AOSP)"</string>
+</resources>
diff --git a/java/res/values-gl-rES/strings-config-important-notice.xml b/java/res/values-gl-rES/strings-config-important-notice.xml
new file mode 100644
index 0000000..11f697d
--- /dev/null
+++ b/java/res/values-gl-rES/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"Aprende das comunicacións e dos datos para mellorar as suxestións"</string>
+</resources>
diff --git a/java/res/values-kn-rIN/strings-action-keys.xml b/java/res/values-kn-rIN/strings-action-keys.xml
new file mode 100644
index 0000000..d54cbda
--- /dev/null
+++ b/java/res/values-kn-rIN/strings-action-keys.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label_go_key" msgid="4033615332628671065">"ಹೋಗು"</string>
+    <string name="label_next_key" msgid="5586407279258592635">"ಮುಂದೆ"</string>
+    <string name="label_previous_key" msgid="1421141755779895275">"ಹಿಂದೆ"</string>
+    <string name="label_done_key" msgid="7564866296502630852">"ಮುಗಿದಿದೆ"</string>
+    <string name="label_send_key" msgid="482252074224462163">"ಕಳುಹಿಸು"</string>
+    <string name="label_search_key" msgid="7965186050435796642">"ಹುಡುಕಾಟ"</string>
+    <string name="label_pause_key" msgid="2225922926459730642">"ವಿರಾಮಗೊಳಿಸು"</string>
+    <string name="label_wait_key" msgid="5891247853595466039">"ನಿರೀಕ್ಷಿಸು"</string>
+</resources>
diff --git a/java/res/values-kn-rIN/strings-appname.xml b/java/res/values-kn-rIN/strings-appname.xml
new file mode 100644
index 0000000..180915a
--- /dev/null
+++ b/java/res/values-kn-rIN/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_name" msgid="5940510615957428904">"Android ಕೀಬೋರ್ಡ್ (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"Android ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"Android ಕೀಬೋರ್ಡ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ ಸೆಟ್ಟಿಂಗ್‌ಗಳು (AOSP)"</string>
+</resources>
diff --git a/java/res/values-kn-rIN/strings-config-important-notice.xml b/java/res/values-kn-rIN/strings-config-important-notice.xml
new file mode 100644
index 0000000..1ac5a29
--- /dev/null
+++ b/java/res/values-kn-rIN/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"ಸಲಹೆಗಳನ್ನು ಸುಧಾರಿಸಲು ನಿಮ್ಮ ಸಂವಹನಗಳು ಮತ್ತು ಟೈಪ್ ಮಾಡಿದ ಡೇಟಾದಿಂದ ತಿಳಿಯಿರಿ"</string>
+</resources>
diff --git a/java/res/values-land/config.xml b/java/res/values-land/config.xml
index 37bf22f..9ee4300 100644
--- a/java/res/values-land/config.xml
+++ b/java/res/values-land/config.xml
@@ -54,7 +54,7 @@
 
     <!-- For 5-row keyboard -->
     <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
-    <fraction name="config_key_letter_ratio_5row">78%</fraction>
+    <fraction name="config_key_letter_ratio_5row">65%</fraction>
     <fraction name="config_key_shifted_letter_hint_ratio_5row">48%</fraction>
 
     <dimen name="config_suggestions_strip_height">36dp</dimen>
diff --git a/java/res/values-ml-rIN/strings-action-keys.xml b/java/res/values-ml-rIN/strings-action-keys.xml
new file mode 100644
index 0000000..46a8cfc
--- /dev/null
+++ b/java/res/values-ml-rIN/strings-action-keys.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label_go_key" msgid="4033615332628671065">"പോകുക"</string>
+    <string name="label_next_key" msgid="5586407279258592635">"അടുത്തത്"</string>
+    <string name="label_previous_key" msgid="1421141755779895275">"മുമ്പത്തെ"</string>
+    <string name="label_done_key" msgid="7564866296502630852">"പൂർത്തിയായി"</string>
+    <string name="label_send_key" msgid="482252074224462163">"അയയ്‌ക്കുക"</string>
+    <string name="label_search_key" msgid="7965186050435796642">"തിരയുക"</string>
+    <string name="label_pause_key" msgid="2225922926459730642">"താൽക്കാലികമായി നിർത്തുക"</string>
+    <string name="label_wait_key" msgid="5891247853595466039">"കാത്തിരിക്കുക"</string>
+</resources>
diff --git a/java/res/values-ml-rIN/strings-appname.xml b/java/res/values-ml-rIN/strings-appname.xml
new file mode 100644
index 0000000..940ee81
--- /dev/null
+++ b/java/res/values-ml-rIN/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_name" msgid="5940510615957428904">"Android കീബോർഡ് (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"Android അക്ഷരത്തെറ്റ് പരിശോധന (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"Android കീബോർഡ് ക്രമീകരണങ്ങൾ (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android അക്ഷരത്തെറ്റ് പരിശോധനാ ക്രമീകരണങ്ങൾ (AOSP)"</string>
+</resources>
diff --git a/java/res/values-ml-rIN/strings-config-important-notice.xml b/java/res/values-ml-rIN/strings-config-important-notice.xml
new file mode 100644
index 0000000..7cdc17b
--- /dev/null
+++ b/java/res/values-ml-rIN/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"നിർദ്ദേശങ്ങൾ മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങളുടെ ആശയവിനിമയങ്ങൾ, ടൈപ്പുചെയ്‌ത ഡാറ്റ എന്നിവയിൽ നിന്നും അറിയുക"</string>
+</resources>
diff --git a/java/res/values-mr-rIN/strings-action-keys.xml b/java/res/values-mr-rIN/strings-action-keys.xml
new file mode 100644
index 0000000..4dadfea
--- /dev/null
+++ b/java/res/values-mr-rIN/strings-action-keys.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label_go_key" msgid="4033615332628671065">"जा"</string>
+    <string name="label_next_key" msgid="5586407279258592635">"पुढील"</string>
+    <string name="label_previous_key" msgid="1421141755779895275">"मागील"</string>
+    <string name="label_done_key" msgid="7564866296502630852">"पूर्ण झाले"</string>
+    <string name="label_send_key" msgid="482252074224462163">"पाठवा"</string>
+    <string name="label_search_key" msgid="7965186050435796642">"शोधा"</string>
+    <string name="label_pause_key" msgid="2225922926459730642">"विराम द्या"</string>
+    <string name="label_wait_key" msgid="5891247853595466039">"प्रतीक्षा करा"</string>
+</resources>
diff --git a/java/res/values-mr-rIN/strings-appname.xml b/java/res/values-mr-rIN/strings-appname.xml
new file mode 100644
index 0000000..80f11e7
--- /dev/null
+++ b/java/res/values-mr-rIN/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_name" msgid="5940510615957428904">"Android कीबोर्ड (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"Android शब्दलेखन तपासक (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"Android कीबोर्ड सेटिंग्ज (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android शब्दलेखन तपासक सेटिंग्ज (AOSP)"</string>
+</resources>
diff --git a/java/res/values-mr-rIN/strings-config-important-notice.xml b/java/res/values-mr-rIN/strings-config-important-notice.xml
new file mode 100644
index 0000000..3ec6e26
--- /dev/null
+++ b/java/res/values-mr-rIN/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"सूचना सुधारण्यासाठी आपल्या संप्रेषणांमधून आणि टाइप केलेल्या डेटामधून जाणून घ्या"</string>
+</resources>
diff --git a/java/res/values-si-rLK/strings-action-keys.xml b/java/res/values-si-rLK/strings-action-keys.xml
index 7a1622a..2271ce9 100644
--- a/java/res/values-si-rLK/strings-action-keys.xml
+++ b/java/res/values-si-rLK/strings-action-keys.xml
@@ -25,8 +25,7 @@
     <string name="label_previous_key" msgid="1421141755779895275">"පෙර"</string>
     <string name="label_done_key" msgid="7564866296502630852">"හරි"</string>
     <string name="label_send_key" msgid="482252074224462163">"යවන්න"</string>
-    <!-- no translation found for label_search_key (7965186050435796642) -->
-    <skip />
+    <string name="label_search_key" msgid="7965186050435796642">"සොයන්න"</string>
     <string name="label_pause_key" msgid="2225922926459730642">"විරාමය"</string>
     <string name="label_wait_key" msgid="5891247853595466039">"රැඳීම"</string>
 </resources>
diff --git a/java/res/values-ta-rIN/strings-action-keys.xml b/java/res/values-ta-rIN/strings-action-keys.xml
new file mode 100644
index 0000000..c07de35
--- /dev/null
+++ b/java/res/values-ta-rIN/strings-action-keys.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label_go_key" msgid="4033615332628671065">"செல்"</string>
+    <string name="label_next_key" msgid="5586407279258592635">"அடுத்து"</string>
+    <string name="label_previous_key" msgid="1421141755779895275">"முன்"</string>
+    <string name="label_done_key" msgid="7564866296502630852">"முடிந்தது"</string>
+    <string name="label_send_key" msgid="482252074224462163">"அனுப்பு"</string>
+    <string name="label_search_key" msgid="7965186050435796642">"தேடு"</string>
+    <string name="label_pause_key" msgid="2225922926459730642">"இடைநிறுத்து"</string>
+    <string name="label_wait_key" msgid="5891247853595466039">"காத்திரு"</string>
+</resources>
diff --git a/java/res/values-ta-rIN/strings-appname.xml b/java/res/values-ta-rIN/strings-appname.xml
new file mode 100644
index 0000000..5ad5eae
--- /dev/null
+++ b/java/res/values-ta-rIN/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_name" msgid="5940510615957428904">"Android Keyboard (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"Android Spell Checker (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"Android Keyboard Settings (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android Spell Checker Settings (AOSP)"</string>
+</resources>
diff --git a/java/res/values-ta-rIN/strings-config-important-notice.xml b/java/res/values-ta-rIN/strings-config-important-notice.xml
new file mode 100644
index 0000000..ae9a4ca
--- /dev/null
+++ b/java/res/values-ta-rIN/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"தொடர்புகளிலிருந்தும், உள்ளிட்ட தரவிலிருந்தும் பரிந்துரைகளை மேம்படுத்த அறியவும்"</string>
+</resources>
diff --git a/java/res/values-te-rIN/strings-action-keys.xml b/java/res/values-te-rIN/strings-action-keys.xml
new file mode 100644
index 0000000..279b7fd
--- /dev/null
+++ b/java/res/values-te-rIN/strings-action-keys.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label_go_key" msgid="4033615332628671065">"వెళ్లు"</string>
+    <string name="label_next_key" msgid="5586407279258592635">"తదుపరి"</string>
+    <string name="label_previous_key" msgid="1421141755779895275">"మునుపటి"</string>
+    <string name="label_done_key" msgid="7564866296502630852">"పూర్తి"</string>
+    <string name="label_send_key" msgid="482252074224462163">"పంపు"</string>
+    <string name="label_search_key" msgid="7965186050435796642">"శోధించు"</string>
+    <string name="label_pause_key" msgid="2225922926459730642">"పాజ్ చేయి"</string>
+    <string name="label_wait_key" msgid="5891247853595466039">"వేచి ఉ."</string>
+</resources>
diff --git a/java/res/values-te-rIN/strings-appname.xml b/java/res/values-te-rIN/strings-appname.xml
new file mode 100644
index 0000000..c644e5f
--- /dev/null
+++ b/java/res/values-te-rIN/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_name" msgid="5940510615957428904">"Android కీబోర్డ్ (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"Android అక్షరక్రమ తనిఖీ (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"Android కీబోర్డ్ సెట్టింగ్‌లు (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android అక్షరక్రమ తనిఖీ సెట్టింగ్‌లు (AOSP)"</string>
+</resources>
diff --git a/java/res/values-te-rIN/strings-config-important-notice.xml b/java/res/values-te-rIN/strings-config-important-notice.xml
new file mode 100644
index 0000000..92ea883
--- /dev/null
+++ b/java/res/values-te-rIN/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"సూచనలను మెరుగుపరచడానికి మీ కమ్యూనికేషన్‌లు మరియు టైప్ చేయబడిన డేటా నుండి తెలుసుకోండి"</string>
+</resources>
diff --git a/java/res/values-th/strings-appname.xml b/java/res/values-th/strings-appname.xml
index af6d1a9..0419368 100644
--- a/java/res/values-th/strings-appname.xml
+++ b/java/res/values-th/strings-appname.xml
@@ -20,8 +20,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="english_ime_name" msgid="5940510615957428904">"แป้นพิมพ์แอนดรอยด์ (AOSP)"</string>
-    <string name="spell_checker_service_name" msgid="1254221805440242662">"เครื่องตรวจตัวสะกดแอนดรอยด์ (AOSP)"</string>
-    <string name="english_ime_settings" msgid="5760361067176802794">"การตั้งค่าแป้นพิมพ์แอนดรอยด์ (AOSP)"</string>
-    <string name="android_spell_checker_settings" msgid="6123949487832861885">"การตั้งค่าเครื่องตรวจตัวสะกดแอนดรอยด์ (AOSP)"</string>
+    <string name="english_ime_name" msgid="5940510615957428904">"แป้นพิมพ์ Android (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"เครื่องตรวจตัวสะกด Android (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"การตั้งค่าแป้นพิมพ์ Android (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"การตั้งค่าเครื่องตรวจตัวสะกด Android (AOSP)"</string>
 </resources>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 3206413..396c166 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -298,6 +298,7 @@
             <flag name="alignLeftOfCenter" value="0x08" />
             <flag name="fontNormal" value="0x10" />
             <flag name="fontMonoSpace" value="0x20" />
+            <flag name="fontDefault" value="0x30" />
             <flag name="followKeyLargeLetterRatio" value="0x40" />
             <flag name="followKeyLetterRatio" value="0x80" />
             <flag name="followKeyLabelRatio" value="0xC0" />
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 9f556a6..7091213 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -60,7 +60,7 @@
 
     <!-- For 5-row keyboard -->
     <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
-    <fraction name="config_key_letter_ratio_5row">64%</fraction>
+    <fraction name="config_key_letter_ratio_5row">55%</fraction>
     <fraction name="config_key_shifted_letter_hint_ratio_5row">41%</fraction>
 
     <dimen name="config_suggestions_strip_height">40dp</dimen>
diff --git a/java/res/xml-sw600dp/keys_arabic3_left.xml b/java/res/xml-sw600dp/keys_arabic3_left.xml
index 9b4031e..87ca105 100644
--- a/java/res/xml-sw600dp/keys_arabic3_left.xml
+++ b/java/res/xml-sw600dp/keys_arabic3_left.xml
@@ -23,10 +23,8 @@
 >
     <!-- U+0630: "ذ" ARABIC LETTER THAL -->
     <Key
-        latin:keySpec="&#x0630;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0630;" />
     <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
     <Key
-        latin:keySpec="&#x0626;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0626;" />
 </merge>
diff --git a/java/res/xml-sw600dp/keys_exclamation_question.xml b/java/res/xml-sw600dp/keys_exclamation_question.xml
index 97bd95d..cf2c61e 100644
--- a/java/res/xml-sw600dp/keys_exclamation_question.xml
+++ b/java/res/xml-sw600dp/keys_exclamation_question.xml
@@ -23,8 +23,10 @@
 >
     <Key
         latin:keySpec="!"
-        latin:moreKeys="!text/morekeys_exclamation" />
+        latin:moreKeys="!text/morekeys_exclamation"
+        latin:keyLabelFlags="fontDefault" />
     <Key
         latin:keySpec="\?"
-        latin:moreKeys="!text/morekeys_question" />
+        latin:moreKeys="!text/morekeys_question"
+        latin:keyLabelFlags="fontDefault" />
 </merge>
diff --git a/java/res/xml-sw600dp/keys_farsi3_right.xml b/java/res/xml-sw600dp/keys_farsi3_right.xml
index 45d1286..c832d55 100644
--- a/java/res/xml-sw600dp/keys_farsi3_right.xml
+++ b/java/res/xml-sw600dp/keys_farsi3_right.xml
@@ -23,10 +23,8 @@
 >
     <!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
     <Key
-        latin:keySpec="&#x0622;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0622;" />
     <!-- U+0686: "چ" ARABIC LETTER TCHEH -->
     <Key
-        latin:keySpec="&#x0686;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0686;" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
index 5a28d45..1b7b416 100644
--- a/java/res/xml-sw600dp/rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -18,35 +18,31 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic1" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic2" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic3" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic3" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_armenian_phonetic.xml b/java/res/xml-sw600dp/rows_armenian_phonetic.xml
index 9bc2a18..ebd16cb 100644
--- a/java/res/xml-sw600dp/rows_armenian_phonetic.xml
+++ b/java/res/xml-sw600dp/rows_armenian_phonetic.xml
@@ -18,53 +18,46 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
-        </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
-        <include
-            latin:keyboardLayout="@xml/key_armenian_xeh" />
     </Row>
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
-        <include
-            latin:keyboardLayout="@xml/key_armenian_sha" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
+        <include latin:keyboardLayout="@xml/key_armenian_xeh" />
+    </Row>
+    <Row
+        latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal"
+    >
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
+        <include latin:keyboardLayout="@xml/key_armenian_sha" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.8889%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_bengali.xml b/java/res/xml-sw600dp/rows_bengali.xml
index b1e7878..10b3e4f 100644
--- a/java/res/xml-sw600dp/rows_bengali.xml
+++ b/java/res/xml-sw600dp/rows_bengali.xml
@@ -18,37 +18,32 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali1" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali2" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml
index a353b67..1d098df 100644
--- a/java/res/xml-sw600dp/rows_farsi.xml
+++ b/java/res/xml-sw600dp/rows_farsi.xml
@@ -18,36 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_farsi1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_farsi2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <include
             latin:keyboardLayout="@xml/rowkeys_farsi3"
             latin:keyXPos="4.091%p" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml
index ca581be..42b92a7 100644
--- a/java/res/xml-sw600dp/rows_hindi.xml
+++ b/java/res/xml-sw600dp/rows_hindi.xml
@@ -18,40 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_hindi_compact.xml b/java/res/xml-sw600dp/rows_hindi_compact.xml
index ac476eb..6493451 100644
--- a/java/res/xml-sw600dp/rows_hindi_compact.xml
+++ b/java/res/xml-sw600dp/rows_hindi_compact.xml
@@ -18,37 +18,32 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_khmer.xml b/java/res/xml-sw600dp/rows_khmer.xml
index 2824a5c..800a3ee 100644
--- a/java/res/xml-sw600dp/rows_khmer.xml
+++ b/java/res/xml-sw600dp/rows_khmer.xml
@@ -18,55 +18,48 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer1" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
-        </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer2" />
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer3" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer2" />
+    </Row>
+    <Row
+        latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
+    >
+        <include latin:keyboardLayout="@xml/rowkeys_khmer3" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer4" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer4" />
         <switch>
-            <case
-                latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-            >
+            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
                 <Spacer />
             </case>
             <default>
-                <include
-                    latin:keyboardLayout="@xml/keys_exclamation_question" />
+                <include latin:keyboardLayout="@xml/keys_exclamation_question" />
             </default>
         </switch>
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_lao.xml b/java/res/xml-sw600dp/rows_lao.xml
index 446d9bd..264e2d9 100644
--- a/java/res/xml-sw600dp/rows_lao.xml
+++ b/java/res/xml-sw600dp/rows_lao.xml
@@ -18,55 +18,48 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao1" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
-        </Row>
-    <Row
-        latin:keyWidth="7.5%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao2" />
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao3" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao2" />
+    </Row>
+    <Row
+        latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
+    >
+        <include latin:keyboardLayout="@xml/rowkeys_lao3" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao4" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao4" />
         <switch>
-            <case
-                latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-            >
+            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
                 <Spacer />
             </case>
             <default>
-                <include
-                    latin:keyboardLayout="@xml/keys_exclamation_question" />
+                <include latin:keyboardLayout="@xml/keys_exclamation_question" />
             </default>
         </switch>
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_marathi.xml b/java/res/xml-sw600dp/rows_marathi.xml
index 51dc7a2..c77bea5 100644
--- a/java/res/xml-sw600dp/rows_marathi.xml
+++ b/java/res/xml-sw600dp/rows_marathi.xml
@@ -18,37 +18,32 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_myanmar.xml b/java/res/xml-sw600dp/rows_myanmar.xml
index 8eedf9d..20d9d8a 100644
--- a/java/res/xml-sw600dp/rows_myanmar.xml
+++ b/java/res/xml-sw600dp/rows_myanmar.xml
@@ -18,46 +18,41 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar1" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
-        </Row>
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar2" />
     </Row>
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar3" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar2" />
+    </Row>
+    <Row
+        latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
+    >
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar3" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar4" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar4" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_nepali_romanized.xml b/java/res/xml-sw600dp/rows_nepali_romanized.xml
index 21d1dc6..fe73fbd 100644
--- a/java/res/xml-sw600dp/rows_nepali_romanized.xml
+++ b/java/res/xml-sw600dp/rows_nepali_romanized.xml
@@ -18,40 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_nepali_traditional.xml b/java/res/xml-sw600dp/rows_nepali_traditional.xml
index 90703da..e56271f 100644
--- a/java/res/xml-sw600dp/rows_nepali_traditional.xml
+++ b/java/res/xml-sw600dp/rows_nepali_traditional.xml
@@ -18,40 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right5" />
-        </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right5" />
+    </Row>
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_sinhala.xml b/java/res/xml-sw600dp/rows_sinhala.xml
index 23c3f3a..2786028 100644
--- a/java/res/xml-sw600dp/rows_sinhala.xml
+++ b/java/res/xml-sw600dp/rows_sinhala.xml
@@ -18,40 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala1" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala2" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml
index 7738c7f..2006056 100644
--- a/java/res/xml-sw600dp/rows_thai.xml
+++ b/java/res/xml-sw600dp/rows_thai.xml
@@ -18,31 +18,29 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai1" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
-        </Row>
+    </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <include
             latin:keyboardLayout="@xml/rowkeys_thai2"
             latin:keyXPos="2.5%p" />
-        <include
-            latin:keyboardLayout="@xml/key_thai_kho_khuat" />
+        <include latin:keyboardLayout="@xml/key_thai_kho_khuat" />
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <include
             latin:keyboardLayout="@xml/rowkeys_thai3"
@@ -53,24 +51,20 @@
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai4" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai4" />
         <switch>
-            <case
-                latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-            >
+            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
                 <Spacer />
             </case>
             <default>
-                <include
-                    latin:keyboardLayout="@xml/keys_exclamation_question" />
+                <include latin:keyboardLayout="@xml/keys_exclamation_question" />
             </default>
         </switch>
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
index 405aebc..d5491d2 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
                  U+093C: "़" DEVANAGARI SIGN NUKTA -->
@@ -36,9 +32,7 @@
                 latin:styleName="moreKeysDevanagariSignAnusvara"
                 latin:moreKeys="&#x0903;,&#x0901;,&#x093C;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
             <key-style
@@ -46,14 +40,12 @@
                 latin:moreKeys="&#x0903;,&#x0901;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignAnusvara" />
+            <key-style latin:styleName="moreKeysDevanagariSignAnusvara" />
         </default>
     </switch>
     <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignAnusvara"
         latin:parentStyle="moreKeysDevanagariSignAnusvara"
-        latin:keySpec="&#x0902;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0902;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
index 6198d01..ef8dec3 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
@@ -22,27 +22,21 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignCandrabindu"
                 latin:moreKeys="&#x0945;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignCandrabindu" />
+            <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" />
         </default>
     </switch>
     <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
     <key-style
         latin:styleName="baseKeyDevanagariSignCandrabindu"
         latin:parentStyle="moreKeysDevanagariSignCandrabindu"
-        latin:keySpec="&#x0901;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0901;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
index e0b47bb..734d060 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
@@ -22,37 +22,29 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
                  U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-             <key-style
+            <key-style
                 latin:styleName="moreKeysDevanagariSignNukta"
                 latin:moreKeys="&#x097D;,&#x0970;,&#x093D;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_romanized"
-        >
+        <case latin:keyboardLayoutSet="nepali_romanized">
             <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
-             <key-style
+            <key-style
                 latin:styleName="moreKeysDevanagariSignNukta"
                 latin:moreKeys="&#x093C;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignNukta" />
+            <key-style latin:styleName="moreKeysDevanagariSignNukta" />
         </default>
     </switch>
     <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignNukta"
         latin:parentStyle="moreKeysDevanagariSignNukta"
-        latin:keySpec="&#x093C;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x093C;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
index 73248e4..0300e4a 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
@@ -22,35 +22,27 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignVirama"
                 latin:moreKeys="&#x094D;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0905: "अ" DEVANAGARI LETTER A -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignVirama"
                 latin:moreKeys="&#x0905;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignVirama" />
+            <key-style latin:styleName="moreKeysDevanagariSignVirama" />
         </default>
     </switch>
     <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignVirama"
         latin:parentStyle="moreKeysDevanagariSignVirama"
-        latin:keySpec="&#x094D;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x094D;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
index b047893..ea64a10 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
@@ -22,12 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignVisarga"
-        latin:keySpec="&#x0903;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0903;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
index cd07999..1e63850 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
@@ -22,44 +22,34 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
                  U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x093E;&#x0902;,&#x093E;&#x0901;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x093E;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x0906;,%" />
         </case>
         <default>
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAa" />
         </default>
     </switch>
     <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignAa"
         latin:parentStyle="moreKeysDevanagariVowelSignAa"
-        latin:keySpec="&#x093E;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x093E;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
index 75a49b1..acb2894 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
@@ -22,51 +22,39 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0948;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0948;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0910;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0936;&#x094D;&#x0930;" />
         </case>
         <default>
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAi" />
         </default>
     </switch>
     <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignAi"
         latin:parentStyle="moreKeysDevanagariVowelSignAi"
-        latin:keySpec="&#x0948;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0948;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
index 26f1aca..e2c3677 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
@@ -22,43 +22,33 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!--U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x094C;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x094C;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x0914;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAu" />
         </default>
     </switch>
     <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignAu"
         latin:parentStyle="moreKeysDevanagariVowelSignAu"
-        latin:keySpec="&#x094C;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x094C;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
index ec056a3..75ad44f 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -22,35 +22,27 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraE"
                 latin:moreKeys="&#x0945;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraE"
                 latin:moreKeys="&#x090D;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraE" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" />
         </default>
     </switch>
     <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignCandraE"
         latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
-        latin:keySpec="&#x0945;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0945;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
index fb4d4eb..e1a4c61 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -22,35 +22,27 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraO"
                 latin:moreKeys="&#x0949;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraO"
                 latin:moreKeys="&#x0911;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraO" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" />
         </default>
     </switch>
     <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignCandraO"
         latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
-        latin:keySpec="&#x0949;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0949;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
index 965bccb..6a99eac 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
@@ -22,37 +22,27 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x0947;&#x0902;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x0947;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x090F;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
             <key-style
@@ -60,14 +50,12 @@
                 latin:moreKeys="&#x0903;,&#x093D;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
         </default>
     </switch>
     <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignE"
         latin:parentStyle="moreKeysDevanagariVowelSignE"
-        latin:keySpec="&#x0947;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0947;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
index ec71c4d..b66149d 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
@@ -22,43 +22,33 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x093F;&#x0902;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x093F;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0907: "इ" DEVANAGARI LETTER I -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x0907;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignI" />
         </default>
     </switch>
     <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignI"
         latin:parentStyle="moreKeysDevanagariVowelSignI"
-        latin:keySpec="&#x093F;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x093F;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
index 9a9f915..97e5007 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
@@ -22,43 +22,33 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x0940;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x0940;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0908: "ई" DEVANAGARI LETTER II -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x0908;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignIi" />
         </default>
     </switch>
     <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignIi"
         latin:parentStyle="moreKeysDevanagariVowelSignIi"
-        latin:keySpec="&#x0940;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0940;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
index 77389c2..7cec76d 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
                  U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
                  U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O -->
@@ -36,31 +32,25 @@
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x094B;&#x0902;,&#x0949;,&#x094A;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x094B;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x0913;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignO" />
         </default>
     </switch>
     <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignO"
         latin:parentStyle="moreKeysDevanagariVowelSignO"
-        latin:keySpec="&#x094B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x094B;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
index e2167bf..c14f920 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
@@ -22,44 +22,34 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
                  U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x0941;&#x0902;,&#x0941;&#x0901;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x0941;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0909: "उ" DEVANAGARI LETTER U -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x0909;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignU" />
         </default>
     </switch>
     <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignU"
         latin:parentStyle="moreKeysDevanagariVowelSignU"
-        latin:keySpec="&#x0941;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0941;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
index 7452368..3134de7 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
@@ -22,44 +22,34 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
                  U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x0942;&#x0902;,&#x0942;&#x0901;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x0942;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x090A;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignUu" />
         </default>
     </switch>
     <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignUu"
         latin:parentStyle="moreKeysDevanagariVowelSignUu"
-        latin:keySpec="&#x0942;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0942;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 9c930d3..da510c1 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -22,30 +22,22 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x0944;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x090B;,&#x0943;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
                  U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
@@ -53,23 +45,19 @@
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x0931;,&#x090B;,&#x0943;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x0913;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
         </default>
     </switch>
     <!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignVocalicR"
         latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keySpec="&#x0943;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0943;" />
 </merge>
diff --git a/java/res/xml/key_armenian_sha.xml b/java/res/xml/key_armenian_sha.xml
index b6418f2..111d426 100644
--- a/java/res/xml/key_armenian_sha.xml
+++ b/java/res/xml/key_armenian_sha.xml
@@ -23,6 +23,5 @@
 >
     <!-- U+0577: "շ" ARMENIAN SMALL LETTER SHA -->
     <Key
-        latin:keySpec="&#x0577;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0577;" />
 </merge>
diff --git a/java/res/xml/key_armenian_xeh.xml b/java/res/xml/key_armenian_xeh.xml
index cfc5bc0..3bbc405 100644
--- a/java/res/xml/key_armenian_xeh.xml
+++ b/java/res/xml/key_armenian_xeh.xml
@@ -23,6 +23,5 @@
 >
     <!-- U+056D: "խ" ARMENIAN SMALL LETTER XEH -->
     <Key
-        latin:keySpec="&#x056D;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x056D;" />
 </merge>
diff --git a/java/res/xml/key_thai_kho_khuat.xml b/java/res/xml/key_thai_kho_khuat.xml
index 84988f8..a43a87c 100644
--- a/java/res/xml/key_thai_kho_khuat.xml
+++ b/java/res/xml/key_thai_kho_khuat.xml
@@ -27,14 +27,12 @@
         >
             <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON -->
             <Key
-                latin:keySpec="&#x0E05;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:keySpec="&#x0E05;" />
         </case>
         <default>
             <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT -->
             <Key
-                latin:keySpec="&#x0E03;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:keySpec="&#x0E03;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/keys_arabic3_left.xml b/java/res/xml/keys_arabic3_left.xml
index 2b3e12c..05ba6d8 100644
--- a/java/res/xml/keys_arabic3_left.xml
+++ b/java/res/xml/keys_arabic3_left.xml
@@ -23,6 +23,5 @@
 >
     <!-- U+0630: "ذ" ARABIC LETTER THAL -->
     <Key
-        latin:keySpec="&#x0630;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0630;" />
 </merge>
diff --git a/java/res/xml/keys_farsi3_right.xml b/java/res/xml/keys_farsi3_right.xml
index 2618e47..867c021 100644
--- a/java/res/xml/keys_farsi3_right.xml
+++ b/java/res/xml/keys_farsi3_right.xml
@@ -23,6 +23,5 @@
 >
     <!-- U+0686: "چ" ARABIC LETTER TCHEH -->
     <Key
-        latin:keySpec="&#x0686;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0686;" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_anusvara.xml b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
index a7e421d..2517ac5 100644
--- a/java/res/xml/keystyle_devanagari_sign_anusvara.xml
+++ b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
@@ -37,9 +33,7 @@
                 latin:styleName="moreKeysDevanagariSignAnusvara"
                 latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x25CC;&#x0901;|&#x0901;,&#x25CC;&#x093C;|&#x093C;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
@@ -48,8 +42,7 @@
                 latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x25CC;&#x0901;|&#x0901;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignAnusvara" />
+            <key-style latin:styleName="moreKeysDevanagariSignAnusvara" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -58,5 +51,5 @@
         latin:styleName="baseKeyDevanagariSignAnusvara"
         latin:parentStyle="moreKeysDevanagariSignAnusvara"
         latin:keySpec="&#x25CC;&#x0902;|&#x0902;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_candrabindu.xml b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
index 24cb44b..3eb6ca0 100644
--- a/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
+++ b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
             <key-style
@@ -36,8 +32,7 @@
                 latin:moreKeys="&#x25CC;&#x0945;|&#x0945;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignCandrabindu" />
+            <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -46,5 +41,5 @@
         latin:styleName="baseKeyDevanagariSignCandrabindu"
         latin:parentStyle="moreKeysDevanagariSignCandrabindu"
         latin:keySpec="&#x25CC;&#x0901;|&#x0901;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_nukta.xml b/java/res/xml/keystyle_devanagari_sign_nukta.xml
index 41da555..e12848c 100644
--- a/java/res/xml/keystyle_devanagari_sign_nukta.xml
+++ b/java/res/xml/keystyle_devanagari_sign_nukta.xml
@@ -22,33 +22,26 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
                  U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-             <key-style
+            <key-style
                 latin:styleName="moreKeysDevanagariSignNukta"
                 latin:moreKeys="&#x25CC;&#x097D;|&#x097D;,&#x25CC;&#x0970;|&#x0970;,&#x25CC;&#x093D;|&#x093D;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_romanized"
-        >
+        <case latin:keyboardLayoutSet="nepali_romanized">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+093C: "़" DEVANAGARI SIGN NUKTA -->
-             <key-style
+            <key-style
                 latin:styleName="moreKeysDevanagariSignNukta"
                 latin:moreKeys="&#x25CC;&#x093C;|&#x093C;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignNukta" />
+            <key-style latin:styleName="moreKeysDevanagariSignNukta" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -57,5 +50,5 @@
         latin:styleName="baseKeyDevanagariSignNukta"
         latin:parentStyle="moreKeysDevanagariSignNukta"
         latin:keySpec="&#x25CC;&#x093C;|&#x093C;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_virama.xml b/java/res/xml/keystyle_devanagari_sign_virama.xml
index 58dd42a..a7c5998 100644
--- a/java/res/xml/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml/keystyle_devanagari_sign_virama.xml
@@ -22,30 +22,23 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+094D: "्" DEVANAGARI SIGN VIRAMA -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignVirama"
                 latin:moreKeys="&#x25CC;&#x094D;|&#x094D;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0905: "अ" DEVANAGARI LETTER A -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignVirama"
                 latin:moreKeys="&#x0905;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignVirama" />
+            <key-style latin:styleName="moreKeysDevanagariSignVirama" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -54,5 +47,5 @@
         latin:styleName="baseKeyDevanagariSignVirama"
         latin:parentStyle="moreKeysDevanagariSignVirama"
         latin:keySpec="&#x25CC;&#x094D;|&#x094D;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
- </merge>
+        latin:keyLabelFlags="followKeyLetterRatio" />
+</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_visarga.xml b/java/res/xml/keystyle_devanagari_sign_visarga.xml
index 45f519a..d66e8e2 100644
--- a/java/res/xml/keystyle_devanagari_sign_visarga.xml
+++ b/java/res/xml/keystyle_devanagari_sign_visarga.xml
@@ -22,13 +22,11 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+25CC: "◌" DOTTED CIRCLE
          U+0903: "ः" DEVANAGARI SIGN VISARGA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignVisarga"
         latin:keySpec="&#x25CC;&#x0903;|&#x0903;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
index 1a60ca2..6a62a1f 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
                  U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU -->
@@ -36,26 +32,21 @@
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x25CC;&#x093E;&#x0902;|&#x093E;&#x0902;,&#x25CC;&#x093E;&#x0901;|&#x093E;&#x0901;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x25CC;&#x093E;|&#x093E;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x0906;,%" />
         </case>
         <default>
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAa" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -64,5 +55,5 @@
         latin:styleName="baseKeyDevanagariVowelSignAa"
         latin:parentStyle="moreKeysDevanagariVowelSignAa"
         latin:keySpec="&#x25CC;&#x093E;|&#x093E;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
index e6b64e5..53f8317 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
@@ -22,47 +22,36 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x25CC;&#x0948;&#x0902;|&#x0948;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x25CC;&#x0948;|&#x0948;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0910;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0936;&#x094D;&#x0930;" />
         </case>
         <default>
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAi" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -71,5 +60,5 @@
         latin:styleName="baseKeyDevanagariVowelSignAi"
         latin:parentStyle="moreKeysDevanagariVowelSignAi"
         latin:keySpec="&#x25CC;&#x0948;|&#x0948;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
index 3e129ec..04f8456 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
@@ -22,39 +22,30 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x25CC;&#x094C;&#x0902;|&#x094C;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x25CC;&#x094C;|&#x094C;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x0914;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAu" />
         </default>
     </switch>
     <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
@@ -62,5 +53,5 @@
         latin:styleName="baseKeyDevanagariVowelSignAu"
         latin:parentStyle="moreKeysDevanagariVowelSignAu"
         latin:keySpec="&#x25CC;&#x094C;|&#x094C;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
index b7d0908..2f2998f 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -22,30 +22,23 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraE"
                 latin:moreKeys="&#x25CC;&#x0945;|&#x0945;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraE"
                 latin:moreKeys="&#x090D;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraE" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -54,5 +47,5 @@
         latin:styleName="baseKeyDevanagariVowelSignCandraE"
         latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
         latin:keySpec="&#x25CC;&#x0945;|&#x0945;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
index 861dd1a..c36e3fb 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -22,30 +22,23 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraO"
                 latin:moreKeys="&#x25CC;&#x0949;|&#x0949;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraO"
                 latin:moreKeys="&#x0911;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraO" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -54,5 +47,5 @@
         latin:styleName="baseKeyDevanagariVowelSignCandraO"
         latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
         latin:keySpec="&#x25CC;&#x0949;|&#x0949;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
index 95d85a9..481e53e 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
@@ -22,39 +22,29 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x25CC;&#x0947;&#x0902;|&#x0947;&#x0902;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0947: "े" DEVANAGARI VOWEL SIGN E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x25CC;&#x0947;|&#x0947;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x090F;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
@@ -63,8 +53,7 @@
                 latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x093D;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -73,5 +62,5 @@
         latin:styleName="baseKeyDevanagariVowelSignE"
         latin:parentStyle="moreKeysDevanagariVowelSignE"
         latin:keySpec="&#x25CC;&#x0947;|&#x0947;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
index 5817be1..4b3a240 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
@@ -22,39 +22,30 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x093F;&#x25CC;&#x0902;|&#x093F;&#x0902;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x25CC;&#x093F;|&#x093F;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0907: "इ" DEVANAGARI LETTER I -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x0907;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignI" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -63,5 +54,5 @@
         latin:styleName="baseKeyDevanagariVowelSignI"
         latin:parentStyle="moreKeysDevanagariVowelSignI"
         latin:keySpec="&#x25CC;&#x093F;|&#x093F;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
index a7863c6..8ade6ef 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
@@ -22,39 +22,30 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x25CC;&#x0940;&#x0902;|&#x0940;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x25CC;&#x0940;|&#x0940;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0908: "ई" DEVANAGARI LETTER II -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x0908;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignIi" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -63,5 +54,5 @@
         latin:styleName="baseKeyDevanagariVowelSignIi"
         latin:parentStyle="moreKeysDevanagariVowelSignIi"
         latin:keySpec="&#x25CC;&#x0940;|&#x0940;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
index 3dc874e..3afded4 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
                  U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
@@ -37,26 +33,21 @@
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x25CC;&#x094B;&#x0902;|&#x094B;&#x0902;,&#x25CC;&#x0949;|&#x0949;,&#x25CC;&#x094A;|&#x094A;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x25CC;&#x094B;|&#x094B;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x0913;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignO" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -65,5 +56,5 @@
         latin:styleName="baseKeyDevanagariVowelSignO"
         latin:parentStyle="moreKeysDevanagariVowelSignO"
         latin:keySpec="&#x25CC;&#x094B;|&#x094B;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
index 226c11a..1eb19b5 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
                  U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU -->
@@ -36,26 +32,21 @@
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x25CC;&#x0941;&#x0902;|&#x0941;&#x0902;,&#x25CC;&#x0941;&#x0901;|&#x0941;&#x0901;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x25CC;&#x0941;|&#x0941;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0909: "उ" DEVANAGARI LETTER U -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x0909;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignU" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -64,5 +55,5 @@
         latin:styleName="baseKeyDevanagariVowelSignU"
         latin:parentStyle="moreKeysDevanagariVowelSignU"
         latin:keySpec="&#x25CC;&#x0941;|&#x0941;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
index 7a9f47d..0bb3426 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
                  U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU -->
@@ -36,26 +32,21 @@
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x25CC;&#x0942;&#x0902;|&#x0942;&#x0902;,&#x25CC;&#x0942;&#x0901;|&#x0942;&#x0901;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x25CC;&#x0942;|&#x0942;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x090A;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignUu" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -64,5 +55,5 @@
         latin:styleName="baseKeyDevanagariVowelSignUu"
         latin:parentStyle="moreKeysDevanagariVowelSignUu"
         latin:keySpec="&#x25CC;&#x0942;|&#x0942;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 56b7396..688826a 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -22,22 +22,16 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x25CC;&#x0944;|&#x0944;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+25CC: "◌" DOTTED CIRCLE
                  U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
@@ -45,9 +39,7 @@
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x090B;,&#x25CC;&#x0943;|&#x0943;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
                  U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+25CC: "◌" DOTTED CIRCLE
@@ -56,17 +48,14 @@
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x0931;,&#x090B;,&#x25CC;&#x0943;|&#x0943;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x0913;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -75,5 +64,5 @@
         latin:styleName="baseKeyDevanagariVowelSignVocalicR"
         latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
         latin:keySpec="&#x25CC;&#x0943;|&#x0943;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml
index 266bba4..9f83fef 100644
--- a/java/res/xml/rowkeys_arabic1.xml
+++ b/java/res/xml/rowkeys_arabic1.xml
@@ -18,30 +18,25 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0636: "ض" ARABIC LETTER DAD
          U+0661: "١" ARABIC-INDIC DIGIT ONE -->
     <Key
         latin:keySpec="&#x0636;"
         latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1,&#x0661;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="1,&#x0661;" />
     <!-- U+0635: "ص" ARABIC LETTER SAD
          U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
     <Key
         latin:keySpec="&#x0635;"
         latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2,&#x0662;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="2,&#x0662;" />
     <!-- U+062B: "ث" ARABIC LETTER THEH
          U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
     <Key
         latin:keySpec="&#x062B;"
         latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3,&#x0663;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="3,&#x0663;" />
     <!-- U+0642: "ق" ARABIC LETTER QAF
          U+0664: "٤" ARABIC-INDIC DIGIT FOUR
          U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
@@ -50,8 +45,7 @@
         latin:keySpec="&#x0642;"
         latin:keyHintLabel="4"
         latin:additionalMoreKeys="4,&#x0664;"
-        latin:moreKeys="&#x06A8;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x06A8;" />
     <!-- U+0641: "ف" ARABIC LETTER FEH
          U+0665: "٥" ARABIC-INDIC DIGIT FIVE
          U+06A4: "ڤ" ARABIC LETTER VEH
@@ -63,22 +57,19 @@
         latin:keySpec="&#x0641;"
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5,&#x0665;"
-        latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" />
     <!-- U+063A: "غ" ARABIC LETTER GHAIN
          U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
     <Key
         latin:keySpec="&#x063A;"
         latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6,&#x0666;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="6,&#x0666;" />
     <!-- U+0639: "ع" ARABIC LETTER AIN
          U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x0639;"
         latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7,&#x0667;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="7,&#x0667;" />
     <!-- U+0647: "ه" ARABIC LETTER HEH
          U+0668: "٨" ARABIC-INDIC DIGIT EIGHT
          U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
@@ -87,26 +78,22 @@
         latin:keySpec="&#x0647;"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8,&#x0668;"
-        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" />
     <!-- U+062E: "خ" ARABIC LETTER KHAH
          U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
     <Key
         latin:keySpec="&#x062E;"
         latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9,&#x0669;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="9,&#x0669;" />
     <!-- U+062D: "ح" ARABIC LETTER HAH
          U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
     <Key
         latin:keySpec="&#x062D;"
         latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0,&#x0660;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="0,&#x0660;" />
     <!-- U+062C: "ج" ARABIC LETTER JEEM
          U+0686: "چ" ARABIC LETTER TCHEH -->
     <Key
         latin:keySpec="&#x062C;"
-        latin:moreKeys="&#x0686;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0686;" />
 </merge>
diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml
index 9bc91e8..4f401e8 100644
--- a/java/res/xml/rowkeys_arabic2.xml
+++ b/java/res/xml/rowkeys_arabic2.xml
@@ -18,33 +18,26 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0634: "ش" ARABIC LETTER SHEEN
          U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
     <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
     <Key
         latin:keySpec="&#x0634;"
-        latin:moreKeys="&#x069C;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x069C;" />
     <!-- U+0633: "س" ARABIC LETTER SEEN -->
-    <Key
-        latin:keySpec="&#x0633;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0633;" />
     <!-- U+064A: "ي" ARABIC LETTER YEH
          U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
          U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
     <Key
         latin:keySpec="&#x064A;"
-        latin:moreKeys="&#x0626;,&#x0649;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0626;,&#x0649;" />
     <!-- U+0628: "ب" ARABIC LETTER BEH
          U+067E: "پ" ARABIC LETTER PEH -->
     <Key
         latin:keySpec="&#x0628;"
-        latin:moreKeys="&#x067E;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x067E;" />
     <!-- U+0644: "ل" ARABIC LETTER LAM
          U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
          U+0627: "ا" ARABIC LETTER ALEF
@@ -56,8 +49,7 @@
          U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
     <Key
         latin:keySpec="&#x0644;"
-        latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;" />
     <!-- U+0627: "ا" ARABIC LETTER ALEF
          U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE
          U+0621: "ء" ARABIC LETTER HAMZA
@@ -66,29 +58,19 @@
          U+0671: "ٱ" ARABIC LETTER ALEF WASLA -->
     <Key
         latin:keySpec="&#x0627;"
-        latin:moreKeys="!fixedColumnOrder!5,&#x0622;,&#x0621;,&#x0623;,&#x0625;,&#x0671;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="!fixedColumnOrder!5,&#x0622;,&#x0621;,&#x0623;,&#x0625;,&#x0671;" />
     <!-- U+062A: "ت" ARABIC LETTER TEH -->
-    <Key
-        latin:keySpec="&#x062A;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x062A;" />
     <!-- U+0646: "ن" ARABIC LETTER NOON -->
-    <Key
-        latin:keySpec="&#x0646;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0646;" />
     <!-- U+0645: "م" ARABIC LETTER MEEM -->
-    <Key
-        latin:keySpec="&#x0645;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0645;" />
     <!-- U+0643: "ك" ARABIC LETTER KAF
          U+06AF: "گ" ARABIC LETTER GAF
          U+06A9: "ک" ARABIC LETTER KEHEH -->
     <Key
         latin:keySpec="&#x0643;"
-        latin:moreKeys="&#x06AF;,&#x06A9;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x06AF;,&#x06A9;" />
     <!-- U+0637: "ط" ARABIC LETTER TAH -->
-    <Key
-        latin:keySpec="&#x0637;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0637;" />
 </merge>
diff --git a/java/res/xml/rowkeys_arabic3.xml b/java/res/xml/rowkeys_arabic3.xml
index 0bfc66a..8b17801 100644
--- a/java/res/xml/rowkeys_arabic3.xml
+++ b/java/res/xml/rowkeys_arabic3.xml
@@ -18,49 +18,30 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/keys_arabic3_left" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/keys_arabic3_left" />
     <!-- U+0621: "ء" ARABIC LETTER HAMZA -->
-    <Key
-        latin:keySpec="&#x0621;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0621;" />
     <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
-    <Key
-        latin:keySpec="&#x0624;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0624;" />
     <!-- U+0631: "ر" ARABIC LETTER REH -->
-    <Key
-        latin:keySpec="&#x0631;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0631;" />
     <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA
          U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
     <Key
         latin:keySpec="&#x0649;"
-        latin:moreKeys="&#x0626;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0626;" />
     <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
-    <Key
-        latin:keySpec="&#x0629;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0629;" />
     <!-- U+0648: "و" ARABIC LETTER WAW -->
-    <Key
-        latin:keySpec="&#x0648;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0648;" />
     <!-- U+0632: "ز" ARABIC LETTER ZAIN
          U+0698: "ژ" ARABIC LETTER JEH -->
     <Key
         latin:keySpec="&#x0632;"
-        latin:moreKeys="&#x0698;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0698;" />
     <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
-    <Key
-        latin:keySpec="&#x0638;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0638;" />
     <!-- U+062F: "د" ARABIC LETTER DAL -->
-    <Key
-        latin:keySpec="&#x062F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x062F;" />
 </merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic1.xml b/java/res/xml/rowkeys_armenian_phonetic1.xml
index 8ca78da..8d54b17 100644
--- a/java/res/xml/rowkeys_armenian_phonetic1.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic1.xml
@@ -18,67 +18,55 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0567: "է" ARMENIAN SMALL LETTER EH -->
     <Key
         latin:keySpec="&#x0567;"
         latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="1" />
     <!-- U+0569: "թ" ARMENIAN SMALL LETTER TO -->
     <Key
         latin:keySpec="&#x0569;"
         latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="2" />
     <!-- U+0583: "փ" ARMENIAN SMALL LETTER PIWR -->
     <Key
         latin:keySpec="&#x0583;"
         latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="3" />
     <!-- U+0571: "ձ" ARMENIAN SMALL LETTER JA -->
     <Key
         latin:keySpec="&#x0571;"
         latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="4" />
     <!-- U+057B: "ջ" ARMENIAN SMALL LETTER JHEH -->
     <Key
         latin:keySpec="&#x057B;"
         latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="5" />
     <!-- U+0580: "ր" ARMENIAN SMALL LETTER REH -->
     <Key
         latin:keySpec="&#x0580;"
         latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="6" />
     <!-- U+0579: "չ" ARMENIAN SMALL LETTER CHA -->
     <Key
         latin:keySpec="&#x0579;"
         latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="7" />
     <!-- U+0573: "ճ" ARMENIAN SMALL LETTER CHEH -->
     <Key
         latin:keySpec="&#x0573;"
         latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="8" />
     <!-- U+056A: "ժ" ARMENIAN SMALL LETTER ZHE -->
     <Key
         latin:keySpec="&#x056A;"
         latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="9" />
     <!-- U+056E: "ծ" ARMENIAN SMALL LETTER CA -->
     <Key
         latin:keySpec="&#x056E;"
         latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="0" />
 </merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic2.xml b/java/res/xml/rowkeys_armenian_phonetic2.xml
index 9991f73..cb1b932 100644
--- a/java/res/xml/rowkeys_armenian_phonetic2.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic2.xml
@@ -18,50 +18,29 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0584: "ք" ARMENIAN SMALL LETTER KEH -->
-    <Key
-        latin:keySpec="&#x0584;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0584;" />
     <!-- U+0578: "ո" ARMENIAN SMALL LETTER VO -->
-    <Key
-        latin:keySpec="&#x0578;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0578;" />
     <!-- U+0565: "ե" ARMENIAN SMALL LETTER ECH
          U+0587: "և" ARMENIAN SMALL LIGATURE ECH YIWN -->
     <Key
         latin:keySpec="&#x0565;"
         latin:moreKeys="&#x0587;"
-        latin:keyHintLabel="&#x0587;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyHintLabel="&#x0587;" />
     <!-- U+057C: "ռ" ARMENIAN SMALL LETTER RA -->
-    <Key
-        latin:keySpec="&#x057C;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x057C;" />
     <!-- U+057F: "տ" ARMENIAN SMALL LETTER TIWN -->
-    <Key
-        latin:keySpec="&#x057F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x057F;" />
     <!-- U+0568: "ը" ARMENIAN SMALL LETTER ET -->
-    <Key
-        latin:keySpec="&#x0568;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0568;" />
     <!-- U+0582: "ւ" ARMENIAN SMALL LETTER YIWN -->
-    <Key
-        latin:keySpec="&#x0582;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0582;" />
     <!-- U+056B: "ի" ARMENIAN SMALL LETTER INI -->
-    <Key
-        latin:keySpec="&#x056B;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x056B;" />
     <!-- U+0585: "օ" ARMENIAN SMALL LETTER OH -->
-    <Key
-        latin:keySpec="&#x0585;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0585;" />
     <!-- U+057A: "պ" ARMENIAN SMALL LETTER PEH -->
-    <Key
-        latin:keySpec="&#x057A;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x057A;" />
 </merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic3.xml b/java/res/xml/rowkeys_armenian_phonetic3.xml
index 2b79386..33db452 100644
--- a/java/res/xml/rowkeys_armenian_phonetic3.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic3.xml
@@ -18,43 +18,23 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0561: "ա" ARMENIAN SMALL LETTER AYB -->
-    <Key
-        latin:keySpec="&#x0561;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0561;" />
     <!-- U+057D: "ս" ARMENIAN SMALL LETTER SEH -->
-    <Key
-        latin:keySpec="&#x057D;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x057D;" />
     <!-- U+0564: "դ" ARMENIAN SMALL LETTER DA -->
-    <Key
-        latin:keySpec="&#x0564;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0564;" />
     <!-- U+0586: "ֆ" ARMENIAN SMALL LETTER FEH -->
-    <Key
-        latin:keySpec="&#x0586;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0586;" />
     <!-- U+0563: "գ" ARMENIAN SMALL LETTER GIM -->
-    <Key
-        latin:keySpec="&#x0563;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0563;" />
     <!-- U+0570: "հ" ARMENIAN SMALL LETTER HO -->
-    <Key
-        latin:keySpec="&#x0570;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0570;" />
     <!-- U+0575: "յ" ARMENIAN SMALL LETTER YI -->
-    <Key
-        latin:keySpec="&#x0575;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0575;" />
     <!-- U+056F: "կ" ARMENIAN SMALL LETTER KEN -->
-    <Key
-        latin:keySpec="&#x056F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x056F;" />
     <!-- U+056C: "լ" ARMENIAN SMALL LETTER LIWN -->
-    <Key
-        latin:keySpec="&#x056C;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x056C;" />
 </merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic4.xml b/java/res/xml/rowkeys_armenian_phonetic4.xml
index f8cdd12..c7db25b 100644
--- a/java/res/xml/rowkeys_armenian_phonetic4.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic4.xml
@@ -18,35 +18,19 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0566: "զ" ARMENIAN SMALL LETTER ZA -->
-    <Key
-        latin:keySpec="&#x0566;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0566;" />
     <!-- U+0572: "ղ" ARMENIAN SMALL LETTER GHAD -->
-    <Key
-        latin:keySpec="&#x0572;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0572;" />
     <!-- U+0581: "ց" ARMENIAN SMALL LETTER CO -->
-    <Key
-        latin:keySpec="&#x0581;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0581;" />
     <!-- U+057E: "վ" ARMENIAN SMALL LETTER VEW -->
-    <Key
-        latin:keySpec="&#x057E;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x057E;" />
     <!-- U+0562: "բ" ARMENIAN SMALL LETTER BEN -->
-    <Key
-        latin:keySpec="&#x0562;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0562;" />
     <!-- U+0576: "ն" ARMENIAN SMALL LETTER NOW -->
-    <Key
-        latin:keySpec="&#x0576;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0576;" />
     <!-- U+0574: "մ" ARMENIAN SMALL LETTER MEN -->
-    <Key
-        latin:keySpec="&#x0574;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0574;" />
 </merge>
diff --git a/java/res/xml/rowkeys_bengali1.xml b/java/res/xml/rowkeys_bengali1.xml
index c137d12..c1fd8b4 100644
--- a/java/res/xml/rowkeys_bengali1.xml
+++ b/java/res/xml/rowkeys_bengali1.xml
@@ -18,44 +18,37 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0994: "ঔ" BENGALI LETTER AU
          U+09E7: "১" BENGALI DIGIT ONE -->
     <Key
         latin:keySpec="&#x0994;"
         latin:keyHintLabel="&#x09E7;"
-        latin:additionalMoreKeys="&#x09E7;,1"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E7;,1" />
     <!-- U+0990: "ঐ" BENGALI LETTER AI
          U+09E8: "২" BENGALI DIGIT TWO -->
     <Key
         latin:keySpec="&#x0990;"
         latin:keyHintLabel="&#x09E8;"
-        latin:additionalMoreKeys="&#x09E8;,2"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E8;,2" />
     <!-- U+0986: "আ" BENGALI LETTER AA
          U+09E9: "৩" BENGALI DIGIT THREE -->
     <Key
         latin:keySpec="&#x0986;"
         latin:keyHintLabel="&#x09E9;"
-        latin:additionalMoreKeys="&#x09E9;,3"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E9;,3" />
     <!-- U+0988: "ঈ" BENGALI LETTER II
          U+09EA: "৪" BENGALI DIGIT FOUR -->
     <Key
         latin:keySpec="&#x0988;"
         latin:keyHintLabel="&#x09EA;"
-        latin:additionalMoreKeys="&#x09EA;,4"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EA;,4" />
     <!-- U+098A: "ঊ" BENGALI LETTER UU
          U+09EB: "৫" BENGALI DIGIT FIVE -->
     <Key
         latin:keySpec="&#x098A;"
         latin:keyHintLabel="&#x09EB;"
-        latin:additionalMoreKeys="&#x09EB;,5"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EB;,5" />
     <!-- U+09AC: "ব" BENGALI LETTER BA
          U+09AD: "ভ" BENGALI LETTER BHA
          U+09EC: "৬" BENGALI DIGIT SIX -->
@@ -63,15 +56,13 @@
         latin:keySpec="&#x09AC;"
         latin:moreKeys="&#x09AD;,%"
         latin:keyHintLabel="&#x09EC;"
-        latin:additionalMoreKeys="&#x09EC;,6"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EC;,6" />
     <!-- U+09B9: "হ" BENGALI LETTER HA
          U+09ED: "৭" BENGALI DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x09B9;"
         latin:keyHintLabel="&#x09ED;"
-        latin:additionalMoreKeys="&#x09ED;,7"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09ED;,7" />
     <!-- U+0997: "গ" BENGALI LETTER GA
          U+0998: "ঘ" BENGALI LETTER GHA
          U+09EE: "৮" BENGALI DIGIT EIGHT -->
@@ -79,8 +70,7 @@
         latin:keySpec="&#x0997;"
         latin:moreKeys="&#x0998;,%"
         latin:keyHintLabel="&#x09EE;"
-        latin:additionalMoreKeys="&#x09EE;,8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EE;,8" />
     <!-- U+09A6: "দ" BENGALI LETTER DA
          U+09A7: "ধ" BENGALI LETTER DHA
          U+09EF: "৯" BENGALI DIGIT NINE -->
@@ -88,8 +78,7 @@
         latin:keySpec="&#x09A6;"
         latin:moreKeys="&#x09A7;,%"
         latin:keyHintLabel="&#x09EF;"
-        latin:additionalMoreKeys="&#x09EF;,9"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EF;,9" />
     <!-- U+099C: "জ" BENGALI LETTER JA
          U+099D: "ঝ" BENGALI LETTER JHA
          U+099C/U+09CD/U+099E: "জ্ঞ" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER NYA
@@ -98,12 +87,10 @@
         latin:keySpec="&#x099C;"
         latin:moreKeys="&#x099D;,&#x099C;&#x09CD;&#x099E;,%"
         latin:keyHintLabel="&#x09E6;"
-        latin:additionalMoreKeys="&#x09E6;,0"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E6;,0" />
     <!-- U+09A1: "ড" BENGALI LETTER DDA
          U+09A1/U+09BC: "ড়" BENGALI LETTER DDA/BENGALI SIGN NUKTA -->
     <Key
         latin:keySpec="&#x09A1;"
-        latin:moreKeys="&#x09A1;&#x09BC;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09A1;&#x09BC;" />
 </merge>
diff --git a/java/res/xml/rowkeys_bengali2.xml b/java/res/xml/rowkeys_bengali2.xml
index 589ce01..44b3617 100644
--- a/java/res/xml/rowkeys_bengali2.xml
+++ b/java/res/xml/rowkeys_bengali2.xml
@@ -18,77 +18,64 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0993: "ও" BENGALI LETTER O
          U+09CB: "ো" BENGALI VOWEL SIGN O -->
     <Key
         latin:keySpec="&#x0993;"
-        latin:moreKeys="&#x09CB;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09CB;" />
     <!-- U+098F: "এ" BENGALI LETTER E
          U+09C7: "ে" BENGALI VOWEL SIGN E -->
     <Key
         latin:keySpec="&#x098F;"
-        latin:moreKeys="&#x09C7;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09C7;" />
     <!-- U+0985: "অ" BENGALI LETTER A
          U+09CD: "্" BENGALI SIGN VIRAMA -->
     <Key
         latin:keySpec="&#x0985;"
-        latin:moreKeys="&#x09CD;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09CD;" />
     <!-- U+0987: "ই" BENGALI LETTER I
          U+09BF: "ি" BENGALI VOWEL SIGN I -->
     <Key
         latin:keySpec="&#x0987;"
-        latin:moreKeys="&#x09BF;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09BF;" />
     <!-- U+0989: "উ" BENGALI LETTER U
          U+09C1: "ু" BENGALI VOWEL SIGN U -->
     <Key
         latin:keySpec="&#x0989;"
-        latin:moreKeys="&#x09C1;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09C1;" />
     <!-- U+09AA: "প" BENGALI LETTER PA
          U+09AB: "ফ" BENGALI LETTER PHA -->
     <Key
         latin:keySpec="&#x09AA;"
-        latin:moreKeys="&#x09AB;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09AB;" />
     <!-- U+09B0: "র" BENGALI LETTER RA
          U+09C3: "ৃ" BENGALI VOWEL SIGN VOCALIC R
          U+098B: "ঋ" BENGALI LETTER VOCALIC R
          U+09A4/U+09CD/U+09B0: "ত্র" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
     <Key
         latin:keySpec="&#x09B0;"
-        latin:moreKeys="&#x09C3;,&#x098B;,&#x09A4;&#x09CD;&#x09B0;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09C3;,&#x098B;,&#x09A4;&#x09CD;&#x09B0;" />
     <!-- U+0995: "ক" BENGALI LETTER KA
          U+0996: "খ" BENGALI LETTER KHA -->
     <Key
         latin:keySpec="&#x0995;"
-        latin:moreKeys="&#x0996;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0996;" />
     <!-- U+09A4: "ত" BENGALI LETTER TA
          U+09CE: "ৎ" BENGALI LETTER KHANDA TA
          U+09A5: "থ" BENGALI LETTER THA
          U+09A4/U+09CD/U+09A4: "ত্ত" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER TA -->
     <Key
         latin:keySpec="&#x09A4;"
-        latin:moreKeys="&#x09CE;,&#x09A5;,&#x09A4;&#x09CD;&#x09A4;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09CE;,&#x09A5;,&#x09A4;&#x09CD;&#x09A4;" />
     <!-- U+099A: "চ" BENGALI LETTER CA
          U+099B: "ছ" BENGALI LETTER CHA -->
     <Key
         latin:keySpec="&#x099A;"
-        latin:moreKeys="&#x099B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x099B;" />
     <!-- U+099F: "ট" BENGALI LETTER TTA
          U+09A0: "ঠ" BENGALI LETTER TTHA -->
     <Key
         latin:keySpec="&#x099F;"
-        latin:moreKeys="&#x09A0;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09A0;" />
 </merge>
diff --git a/java/res/xml/rowkeys_bengali3.xml b/java/res/xml/rowkeys_bengali3.xml
index b6d4685..5222b09 100644
--- a/java/res/xml/rowkeys_bengali3.xml
+++ b/java/res/xml/rowkeys_bengali3.xml
@@ -18,65 +18,51 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0981: "ঁ" BENGALI SIGN CANDRABINDU
          U+0983: "ঃ" BENGALI SIGN VISARGA
          U+0982: "ং" BENGALI SIGN ANUSVARA -->
     <Key
         latin:keySpec="&#x0981;"
-        latin:moreKeys="&#x0983;,&#x0982;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0983;,&#x0982;" />
     <!-- U+09A2: "ঢ" BENGALI LETTER DDHA
          U+09A2/U+09BC: "ঢ়" BENGALI LETTER DDHA/BENGALI SIGN NUKTA -->
     <Key
         latin:keySpec="&#x09A2;"
-        latin:moreKeys="&#x09A2;&#x09BC;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09A2;&#x09BC;" />
     <!-- U+09AE: "ম" BENGALI LETTER MA -->
-    <Key
-        latin:keySpec="&#x09AE;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x09AE;" />
     <!-- U+09A8: "ন" BENGALI LETTER NA
          U+09A3: "ণ" BENGALI LETTER NNA -->
     <Key
         latin:keySpec="&#x09A8;"
-        latin:moreKeys="&#x09A3;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09A3;" />
     <!-- U+099E: "ঞ" BENGALI LETTER NYA
          U+0999: "ঙ" BENGALI LETTER NGA
          U+099E/U+09CD/U+099C: "ঞ্জ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER JA -->
     <Key
         latin:keySpec="&#x099E;"
-        latin:moreKeys="&#x0999;,&#x099E;&#x09CD;&#x099C;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0999;,&#x099E;&#x09CD;&#x099C;" />
     <!-- U+09B2: "ল" BENGALI LETTER LA -->
-    <Key
-        latin:keySpec="&#x09B2;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x09B2;" />
     <!-- U+09B7: "ষ" BENGALI LETTER SSA
          U+0995/U+09CD/U+09B7: "ক্ষ" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SSA -->
     <Key
         latin:keySpec="&#x09B7;"
-        latin:moreKeys="&#x0995;&#x09CD;&#x09B7;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0995;&#x09CD;&#x09B7;" />
     <!-- U+09B8: "স" BENGALI LETTER SA
          U+09B6: "শ" BENGALI LETTER SHA -->
     <Key
         latin:keySpec="&#x09B8;"
-        latin:moreKeys="&#x09B6;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09B6;" />
     <!-- U+09DF: "য়" BENGALI LETTER YYA
          U+09AF: "য" BENGALI LETTER YA -->
     <Key
         latin:keySpec="&#x09DF;"
-        latin:moreKeys="&#x09AF;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09AF;" />
     <!-- U+0964: "।" DEVANAGARI DANDA
          U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
     <Key
         latin:keySpec="&#x0964;"
-        latin:moreKeys="&#x0965;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0965;" />
 </merge>
diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml
index 46fef42..abc2c96 100644
--- a/java/res/xml/rowkeys_farsi1.xml
+++ b/java/res/xml/rowkeys_farsi1.xml
@@ -18,58 +18,49 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0636: "ض" ARABIC LETTER DAD
          U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
     <Key
         latin:keySpec="&#x0636;"
         latin:keyHintLabel="&#x06F1;"
-        latin:additionalMoreKeys="&#x06F1;,1"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F1;,1" />
     <!-- U+0635: "ص" ARABIC LETTER SAD
          U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->
     <Key
         latin:keySpec="&#x0635;"
         latin:keyHintLabel="&#x06F2;"
-        latin:additionalMoreKeys="&#x06F2;,2"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F2;,2" />
     <!-- U+062B: "ث" ARABIC LETTER THEH
          U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE -->
     <Key
         latin:keySpec="&#x062B;"
         latin:keyHintLabel="&#x06F3;"
-        latin:additionalMoreKeys="&#x06F3;,3"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F3;,3" />
     <!-- U+0642: "ق" ARABIC LETTER QAF
          U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR -->
     <Key
         latin:keySpec="&#x0642;"
         latin:keyHintLabel="&#x06F4;"
-        latin:additionalMoreKeys="&#x06F4;,4"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F4;,4" />
     <!-- U+0641: "ف" ARABIC LETTER FEH
          U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE -->
     <Key
         latin:keySpec="&#x0641;"
         latin:keyHintLabel="&#x06F5;"
-        latin:additionalMoreKeys="&#x06F5;,5"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F5;,5" />
     <!-- U+063A: "غ" ARABIC LETTER GHAIN
          U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->
     <Key
         latin:keySpec="&#x063A;"
         latin:keyHintLabel="&#x06F6;"
-        latin:additionalMoreKeys="&#x06F6;,6"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F6;,6" />
     <!-- U+0639: "ع" ARABIC LETTER AIN
          U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x0639;"
         latin:keyHintLabel="&#x06F7;"
-        latin:additionalMoreKeys="&#x06F7;,7"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F7;,7" />
     <!-- U+0647: "ه" ARABIC LETTER HEH
          U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
          U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
@@ -80,24 +71,19 @@
         latin:keySpec="&#x0647;"
         latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%"
         latin:keyHintLabel="&#x06F8;"
-        latin:additionalMoreKeys="&#x06F8;,8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F8;,8" />
     <!-- U+062E: "خ" ARABIC LETTER KHAH
          U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE -->
     <Key
         latin:keySpec="&#x062E;"
         latin:keyHintLabel="&#x06F9;"
-        latin:additionalMoreKeys="&#x06F9;,9"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F9;,9" />
     <!-- U+062D: "ح" ARABIC LETTER HAH
          U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->
     <Key
         latin:keySpec="&#x062D;"
         latin:keyHintLabel="&#x06F0;"
-        latin:additionalMoreKeys="&#x06F0;,0"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F0;,0" />
     <!-- U+062C: "ج" ARABIC LETTER JEEM -->
-    <Key
-        latin:keySpec="&#x062C;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x062C;" />
 </merge>
diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml
index f94ee8e..82f1903 100644
--- a/java/res/xml/rowkeys_farsi2.xml
+++ b/java/res/xml/rowkeys_farsi2.xml
@@ -18,17 +18,11 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0634: "ش" ARABIC LETTER SHEEN -->
-    <Key
-        latin:keySpec="&#x0634;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0634;" />
     <!-- U+0633: "س" ARABIC LETTER SEEN -->
-    <Key
-        latin:keySpec="&#x0633;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0633;" />
     <!-- U+06CC: "ی" ARABIC LETTER FARSI YEH
          U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
          U+064A: "ي" ARABIC LETTER YEH
@@ -36,16 +30,11 @@
          U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
     <Key
         latin:keySpec="&#x06CC;"
-        latin:moreKeys="&#x0626;,&#x064A;,&#xFBE8;|&#x0649;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0626;,&#x064A;,&#xFBE8;|&#x0649;" />
     <!-- U+0628: "ب" ARABIC LETTER BEH -->
-    <Key
-        latin:keySpec="&#x0628;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0628;" />
     <!-- U+0644: "ل" ARABIC LETTER LAM -->
-    <Key
-        latin:keySpec="&#x0644;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0644;" />
     <!-- U+0627: "ا" ARABIC LETTER ALEF
          U+0671: "ٱ" ARABIC LETTER ALEF WASLA
          U+0621: "ء" ARABIC LETTER HAMZA
@@ -54,30 +43,21 @@
          U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW -->
     <Key
         latin:keySpec="&#x0627;"
-        latin:moreKeys="!fixedColumnOrder!5,&#x0671;,&#x0621;,&#x0622;,&#x0623;,&#x0625;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="!fixedColumnOrder!5,&#x0671;,&#x0621;,&#x0622;,&#x0623;,&#x0625;" />
     <!-- U+062A: "ت" ARABIC LETTER TEH
          U+0629: "ة": ARABIC LETTER TEH MARBUTA -->
     <Key
         latin:keySpec="&#x062A;"
-        latin:moreKeys="&#x0629;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0629;" />
     <!-- U+0646: "ن" ARABIC LETTER NOON -->
-    <Key
-        latin:keySpec="&#x0646;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0646;" />
     <!-- U+0645: "م" ARABIC LETTER MEEM -->
-    <Key
-        latin:keySpec="&#x0645;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0645;" />
     <!-- U+06A9: "ک" ARABIC LETTER KEHEH
          U+0643: "ك" ARABIC LETTER KAF -->
     <Key
         latin:keySpec="&#x06A9;"
-        latin:moreKeys="&#x0643;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0643;" />
     <!-- U+06AF: "گ" ARABIC LETTER GAF -->
-    <Key
-        latin:keySpec="&#x06AF;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x06AF;" />
 </merge>
diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml
index edc22f9..b825a36 100644
--- a/java/res/xml/rowkeys_farsi3.xml
+++ b/java/res/xml/rowkeys_farsi3.xml
@@ -18,47 +18,27 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
-    <Key
-        latin:keySpec="&#x0638;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0638;" />
     <!-- U+0637: "ط" ARABIC LETTER TAH -->
-    <Key
-        latin:keySpec="&#x0637;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0637;" />
     <!-- U+0698: "ژ" ARABIC LETTER JEH -->
-    <Key
-        latin:keySpec="&#x0698;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0698;" />
     <!-- U+0632: "ز" ARABIC LETTER ZAIN -->
-    <Key
-        latin:keySpec="&#x0632;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0632;" />
     <!-- U+0631: "ر" ARABIC LETTER REH -->
-    <Key
-        latin:keySpec="&#x0631;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0631;" />
     <!-- U+0630: "ذ" ARABIC LETTER THAL -->
-    <Key
-        latin:keySpec="&#x0630;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0630;" />
     <!-- U+062F: "د" ARABIC LETTER DAL -->
-    <Key
-        latin:keySpec="&#x062F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x062F;" />
     <!-- U+067E: "پ" ARABIC LETTER PEH -->
-    <Key
-        latin:keySpec="&#x067E;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x067E;" />
     <!-- U+0648: "و" ARABIC LETTER WAW
          U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
     <Key
         latin:keySpec="&#x0648;"
-        latin:moreKeys="&#x0624;"
-        latin:keyLabelFlags="fontNormal" />
-    <include
-        latin:keyboardLayout="@xml/keys_farsi3_right" />
+        latin:moreKeys="&#x0624;" />
+    <include latin:keyboardLayout="@xml/keys_farsi3_right" />
 </merge>
diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml
index cff9756..cd08e16 100644
--- a/java/res/xml/rowkeys_hindi1.xml
+++ b/java/res/xml/rowkeys_hindi1.xml
@@ -18,82 +18,61 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0914: "औ" DEVANAGARI LETTER AU
                  U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA -->
             <Key
                 latin:keySpec="&#x0914;"
-                latin:moreKeys="&#x0912;&#x0902;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0912;&#x0902;" />
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI
                  U+0910/U+0902: "ऐं" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA -->
             <Key
                 latin:keySpec="&#x0910;"
-                latin:moreKeys="&#x0910;&#x0902;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0910;&#x0902;" />
             <!-- U+0906: "आ" DEVANAGARI LETTER AA
                  U+0906/U+0902: "आं" DEVANAGARI LETTER AA/DEVANAGARI SIGN ANUSVARA
                  U+0906/U+0901: "आँ" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0906;"
-                latin:moreKeys="&#x0906;&#x0902;,&#x0906;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0906;&#x0902;,&#x0906;&#x0901;" />
             <!-- U+0908: "ई" DEVANAGARI LETTER II
                  U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA -->
             <Key
                 latin:keySpec="&#x0908;"
-                latin:moreKeys="&#x0908;&#x0902;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0908;&#x0902;" />
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU
                  U+090A/U+0902: "ऊं" DEVANAGARI LETTER UU/DEVANAGARI SIGN ANUSVARA
                  U+090A/U+0901: "ऊँ" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x090A;"
-                latin:moreKeys="&#x090A;&#x0902;,&#x090A;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x090A;&#x0902;,&#x090A;&#x0901;" />
             <!-- U+092D: "भ" DEVANAGARI LETTER BHA -->
-            <Key
-                latin:keySpec="&#x092D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092D;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVisarga" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVisarga" />
             <!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
-            <Key
-                latin:keySpec="&#x0918;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0918;" />
             <!-- U+0927: "ध" DEVANAGARI LETTER DHA
                  U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
                  U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
             <Key
                 latin:keySpec="&#x0927;"
-                latin:moreKeys="&#x0915;&#x094D;&#x0937;,&#x0936;&#x094D;&#x0930;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0915;&#x094D;&#x0937;,&#x0936;&#x094D;&#x0930;" />
             <!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
-            <Key
-                latin:keySpec="&#x091D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091D;" />
             <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
-            <Key
-                latin:keySpec="&#x0922;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0922;" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
             <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignAu"
@@ -102,8 +81,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
             <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignAi"
@@ -112,8 +90,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
             <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignAa"
@@ -122,8 +99,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
             <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignIi"
@@ -132,8 +108,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
             <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignUu"
@@ -146,15 +121,13 @@
                 latin:keySpec="&#x092C;"
                 latin:moreKeys="&#x092C;&#x0952;,%"
                 latin:keyHintLabel="6"
-                latin:additionalMoreKeys="&#x096C;,6"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096C;,6" />
             <!-- U+0939: "ह" DEVANAGARI LETTER HA
                  U+096D: "७" DEVANAGARI DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x0939;"
                 latin:keyHintLabel="7"
-                latin:additionalMoreKeys="&#x096D;,7"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096D;,7" />
             <!-- U+0917: "ग" DEVANAGARI LETTER GA
                  U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
                  U+0917/U+093C: "ग़" DEVANAGARI LETTER GA/DEVANAGARI SIGN NUKTA
@@ -164,15 +137,13 @@
                 latin:keySpec="&#x0917;"
                 latin:moreKeys="&#x091C;&#x094D;&#x091E;,&#x0917;&#x093C;,&#x0917;&#x0952;,%"
                 latin:keyHintLabel="8"
-                latin:additionalMoreKeys="&#x096E;,8"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096E;,8" />
             <!-- U+0926: "द" DEVANAGARI LETTER DA
                  U+096F: "९" DEVANAGARI DIGIT NINE -->
             <Key
                 latin:keySpec="&#x0926;"
                 latin:keyHintLabel="9"
-                latin:additionalMoreKeys="&#x096F;,9"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096F;,9" />
             <!-- U+091C: "ज" DEVANAGARI LETTER JA
                  U+091C/U+0952: "ज॒" DEVANAGARI LETTER JA/DEVANAGARI STRESS SIGN ANUDATTA
                  U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
@@ -182,15 +153,13 @@
                 latin:keySpec="&#x091C;"
                 latin:moreKeys="&#x091C;&#x0952;,&#x091C;&#x094D;&#x091E;,&#x091C;&#x093C;,%"
                 latin:keyHintLabel="0"
-                latin:additionalMoreKeys="&#x0966;,0"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0966;,0" />
             <!-- U+0921: "ड" DEVANAGARI LETTER DDA
                  U+0921/U+0952: "ड॒" DEVANAGARI LETTER DDA/DEVANAGARI STRESS SIGN ANUDATTA
                  U+0921/U+093C: "ड़" DEVANAGARI LETTER DDA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x0921;"
-                latin:moreKeys="&#x0921;&#x0952;,&#x0921;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+                latin:moreKeys="&#x0921;&#x0952;,&#x0921;&#x093C;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml
index 7ba4ee1..fec93f3 100644
--- a/java/res/xml/rowkeys_hindi2.xml
+++ b/java/res/xml/rowkeys_hindi2.xml
@@ -18,21 +18,16 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O
                  U+0913/U+0902: "ओं" DEVANAGARI LETTER O/DEVANAGARI SIGN ANUSVARA
                  U+0911: "ऑ" DEVANAGARI LETTER CANDRA O
                  U+0912: "ऒ" DEVANAGARI LETTER SHORT O -->
             <Key
                 latin:keySpec="&#x0913;"
-                latin:moreKeys="&#x0913;&#x0902;,&#x0911;,&#x0912;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0913;&#x0902;,&#x0911;,&#x0912;" />
             <!-- U+090F: "ए" DEVANAGARI LETTER E
                  U+090F/U+0902: "एं" DEVANAGARI LETTER E/DEVANAGARI SIGN ANUSVARA
                  U+090F/U+0901: "एँ" DEVANAGARI LETTER E/DEVANAGARI SIGN CANDRABINDU
@@ -40,129 +35,97 @@
                  U+090E: "ऎ" DEVANAGARI LETTER SHORT E -->
             <Key
                 latin:keySpec="&#x090F;"
-                latin:moreKeys="&#x090F;&#x0902;,&#x090F;&#x0901;,&#x090D;,&#x090E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x090F;&#x0902;,&#x090F;&#x0901;,&#x090D;,&#x090E;" />
             <!-- U+0905: "अ" DEVANAGARI LETTER A
                  U+0905/U+0902: "अं" DEVANAGARI LETTER A/DEVANAGARI SIGN ANUSVARA
                  U+0905/U+0901: "अँ" DEVANAGARI LETTER A/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0905;"
-                latin:moreKeys="&#x0905;&#x0902;,&#x0905;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0905;&#x0902;,&#x0905;&#x0901;" />
             <!-- U+0907: "इ" DEVANAGARI LETTER I
                  U+0907/U+0902: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN ANUSVARA
                  U+0907/U+0901: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0907;"
-                latin:moreKeys="&#x0907;&#x0902;,&#x0907;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0907;&#x0902;,&#x0907;&#x0901;" />
             <!-- U+0909: "उ" DEVANAGARI LETTER U
                  U+0909/U+0902: "उं" DEVANAGARI LETTER U/DEVANAGARI SIGN ANUSVARA
                  U+0909/U+0901: "उँ" DEVANAGARI LETTER U/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0909;"
-                latin:moreKeys="&#x0909;&#x0902;,&#x0909;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0909;&#x0902;,&#x0909;&#x0901;" />
             <!-- U+092B: "फ" DEVANAGARI LETTER PHA
                  U+092B/U+093C: "फ़" DEVANAGARI LETTER PHA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x092B;"
-                latin:moreKeys="&#x092B;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x092B;&#x093C;" />
             <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
                  U+094D/U+0930: "्र" DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA
                  U+0930/U+094D: "र्" DEVANAGARI LETTER RA/DEVANAGARI SIGN VIRAMA -->
             <Key
                 latin:keySpec="&#x0931;"
-                latin:moreKeys="&#x094D;&#x0930;,&#x0930;&#x094D;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x094D;&#x0930;,&#x0930;&#x094D;" />
             <!-- U+0916: "ख" DEVANAGARI LETTER KHA
                  U+0916/U+093C: "ख़" DEVANAGARI LETTER KHA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x0916;"
-                latin:moreKeys="&#x0916;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0916;&#x093C;" />
             <!-- U+0925: "थ" DEVANAGARI LETTER THA -->
-            <Key
-                latin:keySpec="&#x0925;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0925;" />
             <!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
-            <Key
-                latin:keySpec="&#x091B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091B;" />
             <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x0920;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0920;" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignO" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignE" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVirama" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignI" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignU" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
             <!-- U+092A: "प" DEVANAGARI LETTER PA -->
-            <Key
-                latin:keySpec="&#x092A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092A;" />
             <!-- U+0930: "र" DEVANAGARI LETTER RA
                  U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+0930/U+093C: "ऱ" DEVANAGARI LETTER RA/DEVANAGARI SIGN NUKTA
                  U+0960: "ॠ" DEVANAGARI LETTER VOCALIC RR -->
             <Key
                 latin:keySpec="&#x0930;"
-                latin:moreKeys="&#x090B;,&#x0930;&#x093C;,&#x0960;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x090B;,&#x0930;&#x093C;,&#x0960;" />
             <!-- U+0915: "क" DEVANAGARI LETTER KA
                  U+0915/U+093C: "क़" DEVANAGARI LETTER KA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x0915;"
-                latin:moreKeys="&#x0915;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0915;&#x093C;" />
             <!-- U+0924: "त" DEVANAGARI LETTER TA
                  U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
             <Key
                 latin:keySpec="&#x0924;"
-                latin:moreKeys="&#x0924;&#x094D;&#x0930;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0924;&#x094D;&#x0930;" />
             <!-- U+091A: "च" DEVANAGARI LETTER CA -->
-            <Key
-                latin:keySpec="&#x091A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091A;" />
             <!-- U+091F: "ट" DEVANAGARI LETTER TTA -->
-            <Key
-                latin:keySpec="&#x091F;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+            <Key latin:keySpec="&#x091F;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml
index cf36fc5..2e6d686 100644
--- a/java/res/xml/rowkeys_hindi3.xml
+++ b/java/res/xml/rowkeys_hindi3.xml
@@ -18,114 +18,80 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
-            <Key
-                latin:keySpec="&#x0911;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0911;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+            <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
             <!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
-            <Key
-                latin:keySpec="&#x0923;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0923;" />
             <!-- U+0929: "ऩ" DEVANAGARI LETTER NNNA -->
-            <Key
-                latin:keySpec="&#x0929;" />
+            <Key latin:keySpec="&#x0929;" />
             <!-- U+0933: "ळ" DEVANAGARI LETTER LLA
                  U+0934: "ऴ" DEVANAGARI LETTER LLLA -->
             <Key
                 latin:keySpec="&#x0933;"
-                latin:moreKeys="&#x0934;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0934;" />
             <!-- U+0936: "श" DEVANAGARI LETTER SHA -->
-            <Key
-                latin:keySpec="&#x0936;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0936;" />
             <!-- U+0937: "ष" DEVANAGARI LETTER SSA -->
-            <Key
-                latin:keySpec="&#x0937;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0937;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
             <!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
-            <Key
-                latin:keySpec="&#x091E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091E;" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
             <!-- U+092E: "म" DEVANAGARI LETTER MA
                  U+0950: "ॐ" DEVANAGARI OM -->
             <Key
                 latin:keySpec="&#x092E;"
-                latin:moreKeys="&#x0950;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0950;" />
             <!-- U+0928: "न" DEVANAGARI LETTER NA
                  U+091E: "ञ" DEVANAGARI LETTER NYA
                  U+0919: "ङ" DEVANAGARI LETTER NGA
                  U+0928/U+093C: "ऩ" DEVANAGARI LETTER NA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x0928;"
-                latin:moreKeys="&#x091E;,&#x0919;,&#x0928;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x091E;,&#x0919;,&#x0928;&#x093C;" />
             <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-            <Key
-                latin:keySpec="&#x0935;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0935;" />
             <!-- U+0932: "ल" DEVANAGARI LETTER LA
                  U+090C: "ऌ" DEVANAGARI LETTER VOCALIC L
                  U+0961: "ॡ" DEVANAGARI LETTER VOCALIC LL -->
             <Key
                 latin:keySpec="&#x0932;"
-                latin:moreKeys="&#x090C;,&#x0961;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x090C;,&#x0961;" />
             <!-- U+0938: "स" DEVANAGARI LETTER SA -->
-            <Key
-                latin:keySpec="&#x0938;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0938;" />
             <!-- U+092F: "य" DEVANAGARI LETTER YA
                  U+095F: "य़" DEVANAGARI LETTER YYA -->
             <Key
                 latin:keySpec="&#x092F;"
-                latin:moreKeys="&#x095F;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x095F;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignNukta" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
+            <Key latin:keyStyle="baseKeyDevanagariSignNukta" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_hindi_compact1.xml b/java/res/xml/rowkeys_hindi_compact1.xml
index c63de4f..06a0141 100644
--- a/java/res/xml/rowkeys_hindi_compact1.xml
+++ b/java/res/xml/rowkeys_hindi_compact1.xml
@@ -18,74 +18,62 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
     <!-- U+0914: "औ" DEVANAGARI LETTER AU
          U+0967: "१" DEVANAGARI DIGIT ONE -->
     <Key
         latin:keySpec="&#x0914;"
         latin:keyStyle="moreKeysDevanagariVowelSignAu"
         latin:keyHintLabel="1"
-        latin:additionalMoreKeys="&#x0967;,1"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x0967;,1" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
     <!-- U+0910: "ऐ" DEVANAGARI LETTER AI
          U+0968: "२" DEVANAGARI DIGIT TWO -->
     <Key
         latin:keySpec="&#x0910;"
         latin:keyStyle="moreKeysDevanagariVowelSignAi"
         latin:keyHintLabel="2"
-        latin:additionalMoreKeys="&#x0968;,2"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x0968;,2" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
     <!-- U+0906: "आ" DEVANAGARI LETTER AA
          U+0969: "३" DEVANAGARI DIGIT THREE -->
     <Key
         latin:keySpec="&#x0906;"
         latin:keyStyle="moreKeysDevanagariVowelSignAa"
         latin:keyHintLabel="3"
-        latin:additionalMoreKeys="&#x0969;,3"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x0969;,3" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
     <!-- U+0908: "ई" DEVANAGARI LETTER II
          U+096A: "४" DEVANAGARI DIGIT FOUR -->
     <Key
         latin:keySpec="&#x0908;"
         latin:keyStyle="moreKeysDevanagariVowelSignIi"
         latin:keyHintLabel="4"
-        latin:additionalMoreKeys="&#x096A;,4"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096A;,4" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
     <!-- U+090A: "ऊ" DEVANAGARI LETTER UU
          U+096B: "५" DEVANAGARI DIGIT FIVE -->
     <Key
         latin:keySpec="&#x090A;"
         latin:keyStyle="moreKeysDevanagariVowelSignUu"
         latin:keyHintLabel="5"
-        latin:additionalMoreKeys="&#x096B;,5"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096B;,5" />
     <!-- U+092C: "ब" DEVANAGARI LETTER BA
          U+092D: "भ" DEVANAGARI LETTER BHA
          U+096C: "६" DEVANAGARI DIGIT SIX -->
@@ -93,15 +81,13 @@
         latin:keySpec="&#x092C;"
         latin:moreKeys="&#x092D;,%"
         latin:keyHintLabel="6"
-        latin:additionalMoreKeys="&#x096C;,6"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096C;,6" />
     <!-- U+0939: "ह" DEVANAGARI LETTER HA
          U+096D: "७" DEVANAGARI DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x0939;"
         latin:keyHintLabel="7"
-        latin:additionalMoreKeys="&#x096D;,7"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096D;,7" />
     <!-- U+0917: "ग" DEVANAGARI LETTER GA
          U+0918: "घ" DEVANAGARI LETTER GHA
          U+096E: "८" DEVANAGARI DIGIT EIGHT -->
@@ -109,8 +95,7 @@
         latin:keySpec="&#x0917;"
         latin:moreKeys="&#x0918;,%"
         latin:keyHintLabel="8"
-        latin:additionalMoreKeys="&#x096E;,8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096E;,8" />
     <!-- U+0926: "द" DEVANAGARI LETTER DA
          U+0927: "ध" DEVANAGARI LETTER DHA
          U+096F: "९" DEVANAGARI DIGIT NINE -->
@@ -118,8 +103,7 @@
         latin:keySpec="&#x0926;"
         latin:moreKeys="&#x0927;,%"
         latin:keyHintLabel="9"
-        latin:additionalMoreKeys="&#x096F;,9"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096F;,9" />
     <!-- U+091C: "ज" DEVANAGARI LETTER JA
          U+091D: "झ" DEVANAGARI LETTER JHA
          U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
@@ -128,12 +112,10 @@
         latin:keySpec="&#x091C;"
         latin:moreKeys="&#x091D;,&#x091C;&#x094D;&#x091E;,%"
         latin:keyHintLabel="0"
-        latin:additionalMoreKeys="&#x0966;,0"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x0966;,0" />
     <!-- U+0921: "ड" DEVANAGARI LETTER DDA
          U+0922: "ढ" DEVANAGARI LETTER DDHA -->
     <Key
         latin:keySpec="&#x0921;"
-        latin:moreKeys="&#x0922;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0922;" />
 </merge>
diff --git a/java/res/xml/rowkeys_hindi_compact2.xml b/java/res/xml/rowkeys_hindi_compact2.xml
index 06364c2..7cbe5ef 100644
--- a/java/res/xml/rowkeys_hindi_compact2.xml
+++ b/java/res/xml/rowkeys_hindi_compact2.xml
@@ -18,98 +18,79 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
     <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
     <Key
         latin:keySpec="&#x0913;"
-        latin:keyStyle="moreKeysDevanagariVowelSignO"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignO" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
     <!-- U+090F: "ए" DEVANAGARI LETTER E -->
     <Key
         latin:keySpec="&#x090F;"
-        latin:keyStyle="moreKeysDevanagariVowelSignE"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignE" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
     <!-- U+0905: "अ" DEVANAGARI LETTER A -->
     <Key
         latin:keySpec="&#x0905;"
-        latin:keyStyle="moreKeysDevanagariSignVirama"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariSignVirama" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
     <!-- U+0907: "इ" DEVANAGARI LETTER I -->
     <Key
         latin:keySpec="&#x0907;"
-        latin:keyStyle="moreKeysDevanagariVowelSignI"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignI" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
     <!-- U+0909: "उ" DEVANAGARI LETTER U -->
     <Key
         latin:keySpec="&#x0909;"
-        latin:keyStyle="moreKeysDevanagariVowelSignU"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignU" />
     <!-- U+092A: "प" DEVANAGARI LETTER PA
          U+092B: "फ" DEVANAGARI LETTER PHA -->
     <Key
         latin:keySpec="&#x092A;"
-        latin:moreKeys="&#x092B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x092B;" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
     <!-- U+0930: "र" DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0930;"
-        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" />
     <!-- U+0915: "क" DEVANAGARI LETTER KA
          U+0916: "ख" DEVANAGARI LETTER KHA -->
     <Key
         latin:keySpec="&#x0915;"
-        latin:moreKeys="&#x0916;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0916;" />
     <!-- U+0924: "त" DEVANAGARI LETTER TA
          U+0925: "थ" DEVANAGARI LETTER THA
          U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0924;"
-        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;" />
     <!-- U+091A: "च" DEVANAGARI LETTER CA
          U+091B: "छ" DEVANAGARI LETTER CHA -->
     <Key
         latin:keySpec="&#x091A;"
-        latin:moreKeys="&#x091B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x091B;" />
     <!-- U+091F: "ट" DEVANAGARI LETTER TTA
          U+0920: "ठ" DEVANAGARI LETTER TTHA -->
     <Key
         latin:keySpec="&#x091F;"
-        latin:moreKeys="&#x0920;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0920;" />
 </merge>
diff --git a/java/res/xml/rowkeys_hindi_compact3.xml b/java/res/xml/rowkeys_hindi_compact3.xml
index 0e8165e..89a9f9d 100644
--- a/java/res/xml/rowkeys_hindi_compact3.xml
+++ b/java/res/xml/rowkeys_hindi_compact3.xml
@@ -18,72 +18,55 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
     <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
     <Key
         latin:keySpec="&#x0911;"
-        latin:keyStyle="moreKeysDevanagariVowelSignCandraO"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignCandraO" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
     <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
     <Key
         latin:keySpec="&#x090D;"
-        latin:keyStyle="moreKeysDevanagariVowelSignCandraE"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignCandraE" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+    <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
     <!-- U+092E: "म" DEVANAGARI LETTER MA
          U+0950: "ॐ" DEVANAGARI OM -->
     <Key
         latin:keySpec="&#x092E;"
-        latin:moreKeys="&#x0950;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0950;" />
     <!-- U+0928: "न" DEVANAGARI LETTER NA
          U+0923: "ण" DEVANAGARI LETTER NNA
          U+091E: "ञ" DEVANAGARI LETTER NYA
          U+0919: "ङ" DEVANAGARI LETTER NGA -->
     <Key
         latin:keySpec="&#x0928;"
-        latin:moreKeys="&#x0923;,&#x091E;,&#x0919;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0923;,&#x091E;,&#x0919;" />
     <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-    <Key
-        latin:keySpec="&#x0935;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0935;" />
     <!-- U+0932: "ल" DEVANAGARI LETTER LA -->
-    <Key
-        latin:keySpec="&#x0932;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0932;" />
     <!-- U+0938: "स" DEVANAGARI LETTER SA
          U+0936: "श" DEVANAGARI LETTER SHA
          U+0937: "ष" DEVANAGARI LETTER SSA
          U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0938;"
-        latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;" />
     <!-- U+092F: "य" DEVANAGARI LETTER YA -->
-    <Key
-        latin:keySpec="&#x092F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x092F;" />
     <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA -->
     <Key
         latin:keySpec="&#x0915;&#x094D;&#x0937;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/rowkeys_khmer1.xml b/java/res/xml/rowkeys_khmer1.xml
index 567c6af..79fd231 100644
--- a/java/res/xml/rowkeys_khmer1.xml
+++ b/java/res/xml/rowkeys_khmer1.xml
@@ -18,82 +18,75 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+200D: ZERO WIDTH JOINER -->
             <Key
                 latin:keySpec="!"
-                latin:moreKeys="!icon/zwj_key|&#x200D;" />
+                latin:moreKeys="!icon/zwj_key|&#x200D;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+17D7: "ៗ" KHMER SIGN LEK TOO
                  U+200C: ZERO WIDTH NON-JOINER -->
             <Key
                 latin:keySpec="&#x17D7;"
-                latin:moreKeys="!icon/zwnj_key|&#x200C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="!icon/zwnj_key|&#x200C;" />
             <!-- U+17D1: "៑" KHMER SIGN VIRIAM -->
             <Key
                 latin:keySpec="&quot;"
                 latin:keyHintLabel="&#x17D1;"
-                latin:moreKeys="&#x17D1;" />
+                latin:moreKeys="&#x17D1;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+17DB: "៛" KHMER CURRENCY SYMBOL RIEL
                  U+20AC: "€" EURO SIGN -->
             <Key
                 latin:keySpec="&#x17DB;"
                 latin:keyHintLabel="$"
-                latin:moreKeys="$,&#x20AC;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="$,&#x20AC;" />
             <!-- U+17D6: "៖" KHMER SIGN CAMNUC PII KUUH -->
             <Key
                 latin:keySpec="%"
                 latin:keyHintLabel="&#x17D6;"
-                latin:moreKeys="&#x17D6;" />
+                latin:moreKeys="&#x17D6;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+17CD: "៍" KHMER SIGN TOANDAKHIAT
                  U+17D9: "៙" KHMER SIGN PHNAEK MUAN -->
             <Key
                 latin:keySpec="&#x17CD;"
                 latin:keyHintLabel="&#x17D9;"
-                latin:moreKeys="&#x17D9;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17D9;" />
             <!-- U+17D0: "័" KHMER SIGN SAMYOK SANNYA
                  U+17DA: "៚" KHMER SIGN KOOMUUT -->
             <Key
                 latin:keySpec="&#x17D0;"
                 latin:keyHintLabel="&#x17DA;"
                 latin:keyHintLabelVerticalAdjustment="-30%"
-                latin:moreKeys="&#x17DA;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17DA;" />
             <!-- U+17CF: "៏" KHMER SIGN AHSDA -->
             <Key
                 latin:keySpec="&#x17CF;"
                 latin:keyHintLabel="*"
-                latin:moreKeys="*"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="*" />
             <!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -->
             <Key
                 latin:keySpec="("
                 latin:keyHintLabel="{"
-                latin:moreKeys="{,&#x00AB;" />
+                latin:moreKeys="{,&#x00AB;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
             <Key
                 latin:keySpec=")"
                 latin:keyHintLabel="}"
-                latin:moreKeys="},&#x00BB;" />
+                latin:moreKeys="},&#x00BB;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+17CC: "៌" KHMER SIGN ROBAT
                  U+00D7: "×" MULTIPLICATION SIGN -->
             <Key
                 latin:keySpec="&#x17CC;"
                 latin:keyHintLabel="&#x00D7;"
-                latin:moreKeys="&#x00D7;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x00D7;" />
             <!-- U+17CE: "៎" KHMER SIGN KAKABAT -->
-            <Key
-                latin:keySpec="&#x17CE;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17CE;" />
         </case>
         <default>
             <!-- U+17E1: "១" KHMER DIGIT ONE
@@ -102,94 +95,82 @@
                 latin:keySpec="&#x17E1;"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1"
-                latin:moreKeys="&#x17F1;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F1;" />
             <!-- U+17E2: "២" KHMER DIGIT TWO
                  U+17F2: "៲" KHMER SYMBOL LEK ATTAK PII -->
             <Key
                 latin:keySpec="&#x17E2;"
                 latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2"
-                latin:moreKeys="&#x17F2;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F2;" />
             <!-- U+17E3: "៣" KHMER DIGIT THREE
                  U+17F3: "៳" KHMER SYMBOL LEK ATTAK BEI -->
             <Key
                 latin:keySpec="&#x17E3;"
                 latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x17F3;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F3;" />
             <!-- U+17E4: "៤" KHMER DIGIT FOUR
                  U+17F4: "៴" KHMER SYMBOL LEK ATTAK BUON -->
             <Key
                 latin:keySpec="&#x17E4;"
                 latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x17F4;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F4;" />
             <!-- U+17E5: "៥" KHMER DIGIT FIVE
                  U+17F5: "៵" KHMER SYMBOL LEK ATTAK PRAM -->
             <Key
                 latin:keySpec="&#x17E5;"
                 latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x17F5;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F5;" />
             <!-- U+17E6: "៦" KHMER DIGIT SIX
                  U+17F6: "៶" KHMER SYMBOL LEK ATTAK PRAM-MUOY -->
             <Key
                 latin:keySpec="&#x17E6;"
                 latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x17F6;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F6;" />
             <!-- U+17E7: "៧" KHMER DIGIT SEVEN
                  U+17F7: "៷" KHMER SYMBOL LEK ATTAK PRAM-PII -->
             <Key
                 latin:keySpec="&#x17E7;"
                 latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x17F7;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F7;" />
             <!-- U+17E8: "៨" KHMER DIGIT EIGHT
                  U+17F8: "៸" KHMER SYMBOL LEK ATTAK PRAM-BEI -->
             <Key
                 latin:keySpec="&#x17E8;"
                 latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x17F8;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F8;" />
             <!-- U+17E9: "៩" KHMER DIGIT NINE
                  U+17F9: "៹" KHMER SYMBOL LEK ATTAK PRAM-BUON -->
             <Key
                 latin:keySpec="&#x17E9;"
                 latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x17F9;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F9;" />
             <!-- U+17E0: "០" KHMER DIGIT ZERO
                  U+17F0: "៰" KHMER SYMBOL LEK ATTAK SON -->
             <Key
                 latin:keySpec="&#x17E0;"
                 latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0"
-                latin:moreKeys="&#x17F0;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F0;" />
             <!-- U+17A5: "ឥ" KHMER INDEPENDENT VOWEL QI
                  U+17A6: "ឦ" KHMER INDEPENDENT VOWEL QII -->
             <Key
                 latin:keySpec="&#x17A5;"
                 latin:keyHintLabel="&#x17A6;"
-                latin:moreKeys=",&#x17A6;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys=",&#x17A6;" />
             <!-- U+17B2: "ឲ" KHMER INDEPENDENT VOWEL QOO TYPE TWO
                  U+17B1: "ឱ" KHMER INDEPENDENT VOWEL QOO TYPE ONE -->
             <Key
                 latin:keySpec="&#x17B2;"
                 latin:keyHintLabel="&#x17B1;"
-                latin:moreKeys="&#x17B1;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17B1;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_khmer2.xml b/java/res/xml/rowkeys_khmer2.xml
index 4146895..04ca1e0 100644
--- a/java/res/xml/rowkeys_khmer2.xml
+++ b/java/res/xml/rowkeys_khmer2.xml
@@ -18,117 +18,70 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+1788: "ឈ" KHMER LETTER CHO
                  U+17DC: "ៜ" KHMER SIGN AVAKRAHASANYA -->
             <Key
                 latin:keySpec="&#x1788;"
                 latin:keyHintLabel="&#x17DC;"
-                latin:moreKeys="&#x17DC;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+                latin:moreKeys="&#x17DC;" />
             <!-- U+17BA: "ឺ" KHMER VOWEL SIGN YY
                  U+17DD: "៝" KHMER SIGN ATTHACAN -->
             <Key
                 latin:keySpec="&#x17BA;"
                 latin:keyHintLabel="&#x17DD;"
                 latin:keyHintLabelVerticalAdjustment="40%"
-                latin:moreKeys="&#x17DD;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17DD;" />
             <!-- U+17C2: "ែ" KHMER VOWEL SIGN AE -->
-            <Key
-                latin:keySpec="&#x17C2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C2;" />
             <!-- U+17AC: "ឬ" KHMER INDEPENDENT VOWEL RYY
                  U+17AB: "ឫ" KHMER INDEPENDENT VOWEL RY -->
             <Key
                 latin:keySpec="&#x17AC;"
                 latin:keyHintLabel="&#x17AB;"
-                latin:moreKeys="&#x17AB;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17AB;" />
             <!-- U+1791: "ទ" KHMER LETTER TO -->
-            <Key
-                latin:keySpec="&#x1791;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1791;" />
             <!-- U+17BD: "ួ" KHMER VOWEL SIGN UA -->
-            <Key
-                latin:keySpec="&#x17BD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BD;" />
             <!-- U+17BC: "ូ" KHMER VOWEL SIGN UU -->
-            <Key
-                latin:keySpec="&#x17BC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BC;" />
             <!-- U+17B8: "ី" KHMER VOWEL SIGN II -->
-            <Key
-                latin:keySpec="&#x17B8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B8;" />
             <!-- U+17C5: "ៅ" KHMER VOWEL SIGN AU -->
-            <Key
-                latin:keySpec="&#x17C5;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17C5;" />
             <!-- U+1797: "ភ" KHMER LETTER PHO -->
-            <Key
-                latin:keySpec="&#x1797;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1797;" />
             <!-- U+17BF: "ឿ" KHMER VOWEL SIGN YA -->
-            <Key
-                latin:keySpec="&#x17BF;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17BF;" />
             <!-- U+17B0: "ឰ" KHMER INDEPENDENT VOWEL QAI -->
-            <Key
-                latin:keySpec="&#x17B0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B0;" />
         </case>
         <default>
             <!-- U+1786: "ឆ" KHMER LETTER CHA -->
-            <Key
-                latin:keySpec="&#x1786;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1786;" />
             <!-- U+17B9: "ឹ" KHMER VOWEL SIGN Y -->
-            <Key
-                latin:keySpec="&#x17B9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B9;" />
             <!-- U+17C1: "េ" KHMER VOWEL SIGN E -->
-            <Key
-                latin:keySpec="&#x17C1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C1;" />
             <!-- U+179A: "រ" KHMER LETTER RO -->
-            <Key
-                latin:keySpec="&#x179A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x179A;" />
             <!-- U+178F: "ត" KHMER LETTER TA -->
-            <Key
-                latin:keySpec="&#x178F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178F;" />
             <!-- U+1799: "យ" KHMER LETTER YO -->
-            <Key
-                latin:keySpec="&#x1799;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1799;" />
             <!-- U+17BB: "ុ" KHMER VOWEL SIGN U -->
-            <Key
-                latin:keySpec="&#x17BB;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BB;" />
             <!-- U+17B7: "ិ" KHMER VOWEL SIGN I -->
-            <Key
-                latin:keySpec="&#x17B7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B7;" />
             <!-- U+17C4: "ោ" KHMER VOWEL SIGN OO -->
-            <Key
-                latin:keySpec="&#x17C4;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17C4;" />
             <!-- U+1795: "ផ" KHMER LETTER PHA -->
-            <Key
-                latin:keySpec="&#x1795;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1795;" />
             <!-- U+17C0: "ៀ" KHMER VOWEL SIGN IE -->
-            <Key
-                latin:keySpec="&#x17C0;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17C0;" />
             <!-- U+17AA: "ឪ" KHMER INDEPENDENT VOWEL QUUV
                  U+17A7: "ឧ" KHMER INDEPENDENT VOWEL QU
                  U+17B1: "ឱ" KHMER INDEPENDENT VOWEL QOO TYPE ONE
@@ -138,8 +91,7 @@
             <Key
                 latin:keySpec="&#x17AA;"
                 latin:keyHintLabel="&#x17A7;"
-                latin:moreKeys="&#x17A7;,&#x17B1;,&#x17B3;,&#x17A9;,&#x17A8;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17A7;,&#x17B1;,&#x17B3;,&#x17A9;,&#x17A8;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_khmer3.xml b/java/res/xml/rowkeys_khmer3.xml
index 5e6d01f..c2db364 100644
--- a/java/res/xml/rowkeys_khmer3.xml
+++ b/java/res/xml/rowkeys_khmer3.xml
@@ -18,121 +18,76 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+17B6/U+17C6: "ាំ" KHMER VOWEL SIGN AA/KHMER SIGN NIKAHIT -->
             <Key
                 latin:keySpec="&#x17B6;&#x17C6;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+17C3: "ៃ" KHMER VOWEL SIGN AI -->
-            <Key
-                latin:keySpec="&#x17C3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C3;" />
             <!-- U+178C: "ឌ" KHMER LETTER DO -->
-            <Key
-                latin:keySpec="&#x178C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178C;" />
             <!-- U+1792: "ធ" KHMER LETTER THO -->
-            <Key
-                latin:keySpec="&#x1792;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1792;" />
             <!-- U+17A2: "អ" KHMER LETTER QA -->
-            <Key
-                latin:keySpec="&#x17A2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17A2;" />
             <!-- U+17C7: "ះ" KHMER SIGN REAHMUK
                  U+17C8: "ៈ" KHMER SIGN YUUKALEAPINTU -->
             <Key
                 latin:keySpec="&#x17C7;"
                 latin:keyHintLabel="&#x17C8;"
-                latin:moreKeys="&#x17C8;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17C8;" />
             <!-- U+1789: "ញ" KHMER LETTER NYO -->
-            <Key
-                latin:keySpec="&#x1789;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1789;" />
             <!-- U+1782: "គ" KHMER LETTER KO
                  U+179D: "ឝ" KHMER LETTER SHA -->
             <Key
                 latin:keySpec="&#x1782;"
                 latin:keyHintLabel="&#x179D;"
-                latin:moreKeys="&#x179D;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x179D;" />
             <!-- U+17A1: "ឡ" KHMER LETTER LA -->
-            <Key
-                latin:keySpec="&#x17A1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17A1;" />
             <!-- U+17C4/U+17C7: "ោះ" KHMER VOWEL SIGN OO/KHMER SIGN REAHMUK -->
             <Key
                 latin:keySpec="&#x17C4;&#x17C7;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+                latin:keyLabelFlags="followKeyLetterRatio|autoScale" />
             <!-- U+17C9: "៉" KHMER SIGN MUUSIKATOAN -->
-            <Key
-                latin:keySpec="&#x17C9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C9;" />
             <!-- U+17AF: "ឯ" KHMER INDEPENDENT VOWEL QE -->
-            <Key
-                latin:keySpec="&#x17AF;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17AF;" />
         </case>
         <default>
             <!-- U+17B6: "ា" KHMER VOWEL SIGN AA -->
-            <Key
-                latin:keySpec="&#x17B6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B6;" />
             <!-- U+179F: "ស" KHMER LETTER SA -->
-            <Key
-                latin:keySpec="&#x179F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x179F;" />
             <!-- U+178A: "ដ" KHMER LETTER DA -->
-            <Key
-                latin:keySpec="&#x178A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178A;" />
             <!-- U+1790: "ថ" KHMER LETTER THA -->
-            <Key
-                latin:keySpec="&#x1790;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1790;" />
             <!-- U+1784: "ង" KHMER LETTER NGO -->
-            <Key
-                latin:keySpec="&#x1784;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1784;" />
             <!-- U+17A0: "ហ" KHMER LETTER HA -->
-            <Key
-                latin:keySpec="&#x17A0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17A0;" />
             <!-- U+17D2: "្" KHMER SIGN COENG -->
-            <Key
-                latin:keySpec="&#x17D2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17D2;" />
             <!-- U+1780: "ក" KHMER LETTER KA -->
-            <Key
-                latin:keySpec="&#x1780;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1780;" />
             <!-- U+179B: "ល" KHMER LETTER LO -->
-            <Key
-                latin:keySpec="&#x179B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x179B;" />
             <!-- U+17BE: "ើ" KHMER VOWEL SIGN OE -->
-            <Key
-                latin:keySpec="&#x17BE;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BE;" />
             <!-- U+17CB: "់" KHMER SIGN BANTOC -->
-            <Key
-                latin:keySpec="&#x17CB;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17CB;" />
             <!-- U+17AE: "ឮ" KHMER INDEPENDENT VOWEL LYY
                  U+17AD: "ឭ" KHMER INDEPENDENT VOWEL LY
                  U+17B0: "ឰ" KHMER INDEPENDENT VOWEL QAI -->
             <Key
                 latin:keySpec="&#x17AE;"
                 latin:keyHintLabel="&#x17AD;"
-                latin:moreKeys="&#x17AD;,&#x17B0;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17AD;,&#x17B0;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_khmer4.xml b/java/res/xml/rowkeys_khmer4.xml
index 5523d86..70bdcf1 100644
--- a/java/res/xml/rowkeys_khmer4.xml
+++ b/java/res/xml/rowkeys_khmer4.xml
@@ -18,96 +18,62 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+178D: "ឍ" KHMER LETTER TTHO -->
-            <Key
-                latin:keySpec="&#x178D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178D;" />
             <!-- U+1783: "ឃ" KHMER LETTER KHO -->
-            <Key
-                latin:keySpec="&#x1783;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1783;" />
             <!-- U+1787: "ជ" KHMER LETTER CO -->
-            <Key
-                latin:keySpec="&#x1787;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1787;" />
             <!-- U+17C1/U+17C7: "េះ" KHMER VOWEL SIGN E/KHMER SIGN REAHMUK -->
             <Key
                 latin:keySpec="&#x17C1;&#x17C7;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+1796: "ព" KHMER LETTER PO
                  U+179E: "ឞ" KHMER LETTER SSO -->
             <Key
                 latin:keySpec="&#x1796;"
                 latin:keyHintLabel="&#x179E;"
-                latin:moreKeys="&#x179E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x179E;" />
             <!-- U+178E: "ណ" KHMER LETTER NNO -->
-            <Key
-                latin:keySpec="&#x178E;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x178E;" />
             <!-- U+17C6: "ំ" KHMER SIGN NIKAHIT -->
-            <Key
-                latin:keySpec="&#x17C6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C6;" />
             <!-- U+17BB/U+17C7: "ុះ" KHMER VOWEL SIGN U/KHMER SIGN REAHMUK -->
             <Key
                 latin:keySpec="&#x17BB;&#x17C7;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+17D5: "៕" KHMER SIGN BARIYOOSAN -->
+            <Key latin:keySpec="&#x17D5;" />
             <Key
-                latin:keySpec="&#x17D5;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="\?" />
+                latin:keySpec="\?"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+178B: "ឋ" KHMER LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x178B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178B;" />
             <!-- U+1781: "ខ" KHMER LETTER KHA -->
-            <Key
-                latin:keySpec="&#x1781;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1781;" />
             <!-- U+1785: "ច" KHMER LETTER CA -->
-            <Key
-                latin:keySpec="&#x1785;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1785;" />
             <!-- U+179C: "វ" KHMER LETTER VO -->
-            <Key
-                latin:keySpec="&#x179C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x179C;" />
             <!-- U+1794: "ប" KHMER LETTER BA -->
-            <Key
-                latin:keySpec="&#x1794;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1794;" />
             <!-- U+1793: "ន" KHMER LETTER NO -->
-            <Key
-                latin:keySpec="&#x1793;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1793;" />
             <!-- U+1798: "ម" KHMER LETTER MO -->
-            <Key
-                latin:keySpec="&#x1798;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1798;" />
             <!-- U+17BB/U+17C6: "ុំ" KHMER VOWEL SIGN U/KHMER SIGN NIKAHIT -->
             <Key
                 latin:keySpec="&#x17BB;&#x17C6;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+17D4: "។" KHMER SIGN KHAN -->
-            <Key
-                latin:keySpec="&#x17D4;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17D4;" />
             <!-- U+17CA: "៊" KHMER SIGN TRIISAP -->
-            <Key
-                latin:keySpec="&#x17CA;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17CA;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_lao1.xml b/java/res/xml/rowkeys_lao1.xml
index a5085a5..f88d5fd 100644
--- a/java/res/xml/rowkeys_lao1.xml
+++ b/java/res/xml/rowkeys_lao1.xml
@@ -18,61 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0ED1: "໑" LAO DIGIT ONE -->
-            <Key
-                latin:keySpec="&#x0ED1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED1;" />
             <!-- U+0ED2: "໒" LAO DIGIT TWO -->
-            <Key
-                latin:keySpec="&#x0ED2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED2;" />
             <!-- U+0ED3: "໓" LAO DIGIT THREE -->
-            <Key
-                latin:keySpec="&#x0ED3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED3;" />
             <!-- U+0ED4: "໔" LAO DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x0ED4;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED4;" />
             <!-- U+0ECC: "໌" LAO CANCELLATION MARK -->
-            <Key
-                latin:keySpec="&#x0ECC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ECC;" />
             <!-- U+0EBC: "ຼ" LAO SEMIVOWEL SIGN LO -->
-            <Key
-                latin:keySpec="&#x0EBC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EBC;" />
             <!-- U+0ED5: "໕" LAO DIGIT FIVE -->
-            <Key
-                latin:keySpec="&#x0ED5;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED5;" />
             <!-- U+0ED6: "໖" LAO DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x0ED6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED6;" />
             <!-- U+0ED7: "໗" LAO DIGIT SEVEN -->
-            <Key
-                latin:keySpec="&#x0ED7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED7;" />
             <!-- U+0ED8: "໘" LAO DIGIT EIGHT -->
-            <Key
-                latin:keySpec="&#x0ED8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED8;" />
             <!-- U+0ED9: "໙" LAO DIGIT NINE -->
-            <Key
-                latin:keySpec="&#x0ED9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED9;" />
             <!-- U+0ECD/U+0EC8: "ໍ່" LAO NIGGAHITA/LAO TONE MAI EK -->
             <Key
                 latin:keySpec="&#x0ECD;&#x0EC8;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
         </case>
         <default>
             <!-- U+0EA2: "ຢ" LAO LETTER YO
@@ -81,84 +55,69 @@
                 latin:keySpec="&#x0EA2;"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1"
-                latin:moreKeys="&#x0ED1;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED1;" />
             <!-- U+0E9F: "ຟ" LAO LETTER FO SUNG
                  U+0ED2: "໒" LAO DIGIT TWO -->
             <Key
                 latin:keySpec="&#x0E9F;"
                 latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2"
-                latin:moreKeys="&#x0ED2;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED2;" />
             <!-- U+0EC2: "ໂ" LAO VOWEL SIGN O
                  U+0ED3: "໓" LAO DIGIT THREE -->
             <Key
                 latin:keySpec="&#x0EC2;"
                 latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x0ED3;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED3;" />
             <!-- U+0E96: "ຖ" LAO LETTER THO SUNG
                  U+0ED4: "໔" LAO DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x0E96;"
                 latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x0ED4;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED4;" />
             <!-- U+0EB8: "ຸ" LAO VOWEL SIGN U -->
-            <Key
-                latin:keySpec="&#x0EB8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB8;" />
             <!-- U+0EB9: "ູ" LAO VOWEL SIGN UU -->
-            <Key
-                latin:keySpec="&#x0EB9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB9;" />
             <!-- U+0E84: "ຄ" LAO LETTER KHO TAM
                  U+0ED5: "໕" LAO DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x0E84;"
                 latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x0ED5;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED5;" />
             <!-- U+0E95: "ຕ" LAO LETTER TO
                  U+0ED6: "໖" LAO DIGIT SIX -->
             <Key
                 latin:keySpec="&#x0E95;"
                 latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x0ED6;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED6;" />
             <!-- U+0E88: "ຈ" LAO LETTER CO
                  U+0ED7: "໗" LAO DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x0E88;"
                 latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x0ED7;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED7;" />
             <!-- U+0E82: "ຂ" LAO LETTER KHO SUNG
                  U+0ED8: "໘" LAO DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x0E82;"
                 latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x0ED8;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED8;" />
             <!-- U+0E8A: "ຊ" LAO LETTER SO TAM
                  U+0ED9: "໙" LAO DIGIT NINE -->
             <Key
                 latin:keySpec="&#x0E8A;"
                 latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x0ED9;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED9;" />
             <!-- U+0ECD: "ໍ" LAO NIGGAHITA -->
-            <Key
-                latin:keySpec="&#x0ECD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ECD;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_lao2.xml b/java/res/xml/rowkeys_lao2.xml
index 67c474f..46b6395 100644
--- a/java/res/xml/rowkeys_lao2.xml
+++ b/java/res/xml/rowkeys_lao2.xml
@@ -18,110 +18,78 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0EBB/U+0EC9: "" LAO VOWEL SIGN MAI KON/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EBB;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0ED0: "໐" LAO DIGIT ZERO -->
-            <Key
-                latin:keySpec="&#x0ED0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED0;" />
             <!-- U+0EB3/U+0EC9: "ຳ້" LAO VOWEL SIGN AM/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB3;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <Key
-                latin:keySpec="_" />
+                latin:keySpec="_"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="+" />
+                latin:keySpec="+"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0EB4/U+0EC9: "ິ້" LAO VOWEL SIGN I/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB4;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0EB5/U+0EC9: "ີ້" LAO VOWEL SIGN II/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB5;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0EA3: "ຣ" LAO LETTER LO LING -->
-            <Key
-                latin:keySpec="&#x0EA3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EA3;" />
             <!-- U+0EDC: "ໜ" LAO HO NO -->
-            <Key
-                latin:keySpec="&#x0EDC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EDC;" />
             <!-- U+0EBD: "ຽ" LAO SEMIVOWEL SIGN NYO -->
-            <Key
-                latin:keySpec="&#x0EBD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EBD;" />
             <!-- U+0EAB/U+0EBC: "" LAO LETTER HO SUNG/LAO SEMIVOWEL SIGN LO -->
             <Key
                 latin:keySpec="&#x0EAB;&#x0EBC;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+201D: "”" RIGHT DOUBLE QUOTATION MARK -->
             <Key
-                latin:keySpec="&#x201D;" />
+                latin:keySpec="&#x201D;"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0EBB: "ົ" LAO VOWEL SIGN MAI KON -->
-            <Key
-                latin:keySpec="&#x0EBB;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EBB;" />
             <!-- U+0EC4: "ໄ" LAO VOWEL SIGN AI
                  U+0ED0: "໐" LAO DIGIT ZERO -->
             <Key
                 latin:keySpec="&#x0EC4;"
                 latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0"
-                latin:moreKeys="&#x0ED0;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED0;" />
             <!-- U+0EB3: "ຳ" LAO VOWEL SIGN AM -->
-            <Key
-                latin:keySpec="&#x0EB3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB3;" />
             <!-- U+0E9E: "ພ" LAO LETTER PHO TAM -->
-            <Key
-                latin:keySpec="&#x0E9E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9E;" />
             <!-- U+0EB0: "ະ" LAO VOWEL SIGN A -->
-            <Key
-                latin:keySpec="&#x0EB0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB0;" />
             <!-- U+0EB4: "ິ" LAO VOWEL SIGN I -->
-            <Key
-                latin:keySpec="&#x0EB4;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB4;" />
             <!-- U+0EB5: "ີ" LAO VOWEL SIGN II -->
-            <Key
-                latin:keySpec="&#x0EB5;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB5;" />
             <!-- U+0EAE: "ຮ" LAO LETTER HO TAM -->
-            <Key
-                latin:keySpec="&#x0EAE;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAE;" />
             <!-- U+0E99: "ນ" LAO LETTER NO -->
-            <Key
-                latin:keySpec="&#x0E99;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E99;" />
             <!-- U+0E8D: "ຍ" LAO LETTER NYO -->
-            <Key
-                latin:keySpec="&#x0E8D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E8D;" />
             <!-- U+0E9A: "ບ" LAO LETTER BO -->
-            <Key
-                latin:keySpec="&#x0E9A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9A;" />
             <!-- U+0EA5: "ລ" LAO LETTER LO LOOT -->
-            <Key
-                latin:keySpec="&#x0EA5;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EA5;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_lao3.xml b/java/res/xml/rowkeys_lao3.xml
index 172716d..ab3e251 100644
--- a/java/res/xml/rowkeys_lao3.xml
+++ b/java/res/xml/rowkeys_lao3.xml
@@ -18,93 +18,73 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0EB1/U+0EC9: "ັ້" LAO VOWEL SIGN MAI KAN/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB1;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <Key
-                latin:keySpec=";" />
+                latin:keySpec=";"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="." />
+                latin:keySpec="."
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="," />
+                latin:keySpec=","
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec=":" />
+                latin:keySpec=":"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0ECA: "໊" LAO TONE MAI TI -->
-            <Key
-                latin:keySpec="&#x0ECA;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ECA;" />
             <!-- U+0ECB: "໋" LAO TONE MAI CATAWA -->
+            <Key latin:keySpec="&#x0ECB;" />
             <Key
-                latin:keySpec="&#x0ECB;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:keySpec="!"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="!" />
+                latin:keySpec="\?"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="\?" />
+                latin:keySpec="%"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="%" />
-            <Key
-                latin:keySpec="=" />
+                latin:keySpec="="
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
             <Key
-                latin:keySpec="&#x201C;" />
+                latin:keySpec="&#x201C;"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0EB1: "ັ" LAO VOWEL SIGN MAI KAN -->
-            <Key
-                latin:keySpec="&#x0EB1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB1;" />
             <!-- U+0EAB: "ຫ" LAO LETTER HO SUNG -->
-            <Key
-                latin:keySpec="&#x0EAB;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAB;" />
             <!-- U+0E81: "ກ" LAO LETTER KO -->
-            <Key
-                latin:keySpec="&#x0E81;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E81;" />
             <!-- U+0E94: "ດ" LAO LETTER DO -->
-            <Key
-                latin:keySpec="&#x0E94;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E94;" />
             <!-- U+0EC0: "ເ" LAO VOWEL SIGN E -->
-            <Key
-                latin:keySpec="&#x0EC0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC0;" />
             <!-- U+0EC9: "້" LAO TONE MAI THO -->
-            <Key
-                latin:keySpec="&#x0EC9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC9;" />
             <!-- U+0EC8: "່" LAO TONE MAI EK -->
-            <Key
-                latin:keySpec="&#x0EC8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC8;" />
             <!-- U+0EB2: "າ" LAO VOWEL SIGN AA -->
-            <Key
-                latin:keySpec="&#x0EB2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB2;" />
             <!-- U+0EAA: "ສ" LAO LETTER SO SUNG -->
-            <Key
-                latin:keySpec="&#x0EAA;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAA;" />
             <!-- U+0EA7: "ວ" LAO LETTER WO -->
-            <Key
-                latin:keySpec="&#x0EA7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EA7;" />
             <!-- U+0E87: "ງ" LAO LETTER NGO -->
-            <Key
-                latin:keySpec="&#x0E87;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E87;" />
             <!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
             <Key
-                latin:keySpec="&#x201C;" />
+                latin:keySpec="&#x201C;"
+                latin:keyLabelFlags="fontDefault" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_lao4.xml b/java/res/xml/rowkeys_lao4.xml
index ed4b9b1..5beb1cb 100644
--- a/java/res/xml/rowkeys_lao4.xml
+++ b/java/res/xml/rowkeys_lao4.xml
@@ -18,86 +18,60 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+20AD: "₭" KIP SIGN -->
             <Key
-                latin:keySpec="&#x20AD;" />
+                latin:keySpec="&#x20AD;"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="(" />
-            <!-- U+0EAF: "ຯ" LAO ELLIPSIS -->
+                latin:keySpec="("
+                latin:keyLabelFlags="fontDefault" />
+            <Key latin:keySpec="&#x0EAF;" />
             <Key
-                latin:keySpec="&#x0EAF;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="\@" />
+                latin:keySpec="\@"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0EB6/U+0EC9: "ຶ້" LAO VOWEL SIGN Y/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB6;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0EB7/U+0EC9: "ື້" LAO VOWEL SIGN YY/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB7;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0EC6: "ໆ" LAO KO LA -->
-            <Key
-                latin:keySpec="&#x0EC6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC6;" />
             <!-- U+0EDD: "ໝ" LAO HO MO -->
+            <Key latin:keySpec="&#x0EDD;" />
             <Key
-                latin:keySpec="&#x0EDD;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:keySpec="$"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="$" />
-            <Key
-                latin:keySpec=")" />
+                latin:keySpec=")"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0E9C: "ຜ" LAO LETTER PHO SUNG -->
-            <Key
-                latin:keySpec="&#x0E9C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9C;" />
             <!-- U+0E9B: "ປ" LAO LETTER PO -->
-            <Key
-                latin:keySpec="&#x0E9B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9B;" />
             <!-- U+0EC1: "ແ" LAO VOWEL SIGN EI -->
-            <Key
-                latin:keySpec="&#x0EC1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC1;" />
             <!-- U+0EAD: "ອ" LAO LETTER O -->
-            <Key
-                latin:keySpec="&#x0EAD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAD;" />
             <!-- U+0EB6: "ຶ" LAO VOWEL SIGN Y -->
-            <Key
-                latin:keySpec="&#x0EB6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB6;" />
             <!-- U+0EB7: "ື" LAO VOWEL SIGN YY -->
-            <Key
-                latin:keySpec="&#x0EB7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB7;" />
             <!-- U+0E97: "ທ" LAO LETTER THO TAM -->
-            <Key
-                latin:keySpec="&#x0E97;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E97;" />
             <!-- U+0EA1: "ມ" LAO LETTER MO -->
-            <Key
-                latin:keySpec="&#x0EA1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EA1;" />
             <!-- U+0EC3: "ໃ" LAO VOWEL SIGN AY -->
-            <Key
-                latin:keySpec="&#x0EC3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC3;" />
             <!-- U+0E9D: "ຝ" LAO LETTER FO TAM -->
-            <Key
-                latin:keySpec="&#x0E9D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9D;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_marathi1.xml b/java/res/xml/rowkeys_marathi1.xml
index 810e71e..596664b 100644
--- a/java/res/xml/rowkeys_marathi1.xml
+++ b/java/res/xml/rowkeys_marathi1.xml
@@ -18,14 +18,11 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
     <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
     <Key
         latin:keyStyle="baseKeyDevanagariVowelSignAu"
@@ -34,8 +31,7 @@
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
     <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
     <Key
         latin:keyStyle="baseKeyDevanagariVowelSignAi"
@@ -44,8 +40,7 @@
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
     <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
     <Key
         latin:keyStyle="baseKeyDevanagariVowelSignAa"
@@ -54,8 +49,7 @@
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
     <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
     <Key
         latin:keyStyle="baseKeyDevanagariVowelSignIi"
@@ -64,8 +58,7 @@
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
     <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
     <Key
         latin:keyStyle="baseKeyDevanagariVowelSignUu"
@@ -78,15 +71,13 @@
         latin:keySpec="&#x092C;"
         latin:moreKeys="&#x092D;,%"
         latin:keyHintLabel="6"
-        latin:additionalMoreKeys="&#x096C;,6"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096C;,6" />
     <!-- U+0939: "ह" DEVANAGARI LETTER HA
          U+096D: "७" DEVANAGARI DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x0939;"
         latin:keyHintLabel="7"
-        latin:additionalMoreKeys="&#x096D;,7"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096D;,7" />
     <!-- U+0917: "ग" DEVANAGARI LETTER GA
          U+0918: "घ" DEVANAGARI LETTER GHA
          U+096E: "८" DEVANAGARI DIGIT EIGHT -->
@@ -94,8 +85,7 @@
         latin:keySpec="&#x0917;"
         latin:moreKeys="&#x0918;,%"
         latin:keyHintLabel="8"
-        latin:additionalMoreKeys="&#x096E;,8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096E;,8" />
     <!-- U+0926: "द" DEVANAGARI LETTER DA
          U+0927: "ध" DEVANAGARI LETTER DHA
          U+096F: "९" DEVANAGARI DIGIT NINE -->
@@ -103,8 +93,7 @@
         latin:keySpec="&#x0926;"
         latin:moreKeys="&#x0927;,%"
         latin:keyHintLabel="9"
-        latin:additionalMoreKeys="&#x096F;,9"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096F;,9" />
     <!-- U+091C: "ज" DEVANAGARI LETTER JA
          U+091D: "झ" DEVANAGARI LETTER JHA
          U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER JHA -->
@@ -112,12 +101,10 @@
         latin:keySpec="&#x091C;"
         latin:moreKeys="&#x091D;,&#x091C;&#x094D;&#x091E;,%"
         latin:keyHintLabel="0"
-        latin:additionalMoreKeys="&#x0966;,0"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x0966;,0" />
     <!-- U+0921: "ड" DEVANAGARI LETTER DDA
          U+0922: "ढ" DEVANAGARI LETTER DDHA -->
     <Key
         latin:keySpec="&#x0921;"
-        latin:moreKeys="&#x0922;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0922;" />
 </merge>
diff --git a/java/res/xml/rowkeys_marathi2.xml b/java/res/xml/rowkeys_marathi2.xml
index f950915..060822e 100644
--- a/java/res/xml/rowkeys_marathi2.xml
+++ b/java/res/xml/rowkeys_marathi2.xml
@@ -18,83 +18,64 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignO" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignE" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariSignVirama" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+    <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignI" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignU" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
     <!-- U+092A: "प" DEVANAGARI LETTER PA
          U+092B: "फ" DEVANAGARI LETTER PHA -->
     <Key
         latin:keySpec="&#x092A;"
-        latin:moreKeys="&#x092B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x092B;" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
     <!-- U+0930: "र" DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0930;"
-        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" />
     <!-- U+0915: "क" DEVANAGARI LETTER KA
          U+0916: "ख" DEVANAGARI LETTER KHA -->
     <Key
         latin:keySpec="&#x0915;"
-        latin:moreKeys="&#x0916;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0916;" />
     <!-- U+0924: "त" DEVANAGARI LETTER TA
          U+0925: "थ" DEVANAGARI LETTER THA
          U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0924;"
-        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;" />
     <!-- U+091A: "च" DEVANAGARI LETTER CA
          U+091B: "छ" DEVANAGARI LETTER CHA -->
     <Key
         latin:keySpec="&#x091A;"
-        latin:moreKeys="&#x091B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x091B;" />
     <!-- U+091F: "ट" DEVANAGARI LETTER TTA
          U+0920: "ठ" DEVANAGARI LETTER TTHA -->
     <Key
         latin:keySpec="&#x091F;"
-        latin:moreKeys="&#x0920;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0920;" />
 </merge>
diff --git a/java/res/xml/rowkeys_marathi3.xml b/java/res/xml/rowkeys_marathi3.xml
index 17fc5ac..661e796 100644
--- a/java/res/xml/rowkeys_marathi3.xml
+++ b/java/res/xml/rowkeys_marathi3.xml
@@ -18,66 +18,49 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignCandraE" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraE" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+    <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
     <!-- U+092E: "म" DEVANAGARI LETTER MA -->
-    <Key
-        latin:keySpec="&#x092E;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x092E;" />
     <!-- U+0928: "न" DEVANAGARI LETTER NA
          U+0923: "ण" DEVANAGARI LETTER NNA
          U+091E: "ञ" DEVANAGARI LETTER NYA
          U+0919: "ङ" DEVANAGARI LETTER NGA -->
     <Key
         latin:keySpec="&#x0928;"
-        latin:moreKeys="&#x0923;,&#x091E;,&#x0919;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0923;,&#x091E;,&#x0919;" />
     <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-    <Key
-        latin:keySpec="&#x0935;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0935;" />
     <!-- U+0932: "ल" DEVANAGARI LETTER LA
          U+0933: "ळ" DEVANAGARI LETTER LLA -->
     <Key
         latin:keySpec="&#x0932;"
-        latin:moreKeys="&#x0933;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0933;" />
     <!-- U+0938: "स" DEVANAGARI LETTER SA
          U+0936: "श" DEVANAGARI LETTER SHA
          U+0937: "ष" DEVANAGARI LETTER SSA
          U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0938;"
-        latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;" />
     <!-- U+092F: "य" DEVANAGARI LETTER YA -->
-    <Key
-        latin:keySpec="&#x092F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x092F;" />
     <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA -->
     <Key
         latin:keySpec="&#x0915;&#x094D;&#x0937;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/rowkeys_myanmar1.xml b/java/res/xml/rowkeys_myanmar1.xml
index b7c8209..1170074 100644
--- a/java/res/xml/rowkeys_myanmar1.xml
+++ b/java/res/xml/rowkeys_myanmar1.xml
@@ -18,116 +18,88 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+1027: "ဧ" MYANMAR LETTER E -->
-            <Key
-                latin:keySpec="&#x1027;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1027;" />
             <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE -->
-            <Key
-                latin:keySpec="&#x104F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104F;" />
             <!-- U+1024: "ဤ" MYANMAR LETTER II -->
-            <Key
-                latin:keySpec="&#x1024;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1024;" />
             <!-- U+1023: "ဣ" MYANMAR LETTER I -->
-            <Key
-                latin:keySpec="&#x1023;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1023;" />
             <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED -->
-            <Key
-                latin:keySpec="&#x104E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104E;" />
             <!-- U+1000/U+103B/U+1015/U+103A: "ကျပ်"
                  MYANMAR LETTER KA/MYANMAR CONSONANT SIGN MEDIAL YA/MYANMAR LETTER PA/MYANMAR SIGN ASAT -->
             <Key
                 latin:keySpec="&#x1000;&#x103B;&#x1015;&#x103A;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+                latin:keyLabelFlags="followKeyLetterRatio|autoScale" />
             <!-- U+1029: "ဩ" MYANMAR LETTER O -->
             <Key
                 latin:keySpec="&#x1029;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+                latin:keyLabelFlags="autoScale" />
             <!-- U+102A: "ဪ" MYANMAR LETTER AU -->
             <Key
                 latin:keySpec="&#x102A;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+                latin:keyLabelFlags="autoScale" />
             <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED -->
-            <Key
-                latin:keySpec="&#x104D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104D;" />
             <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE -->
-            <Key
-                latin:keySpec="&#x104C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104C;" />
         </case>
         <default>
             <!-- U+1041: "၁" MYANMAR DIGIT ONE -->
             <Key
                 latin:keySpec="&#x1041;"
                 latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="1" />
             <!-- U+1042: "၂" MYANMAR DIGIT TWO -->
             <Key
                 latin:keySpec="&#x1042;"
                 latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="2" />
             <!-- U+1043: "၃" MYANMAR DIGIT THREE -->
             <Key
                 latin:keySpec="&#x1043;"
                 latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="3" />
             <!-- U+1044: "၄" MYANMAR DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x1044;"
                 latin:keyHintLabel="4"
-                latin:additionalMoreKeys="4"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="4" />
             <!-- U+1045: "၅" MYANMAR DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x1045;"
                 latin:keyHintLabel="5"
-                latin:additionalMoreKeys="5"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="5" />
             <!-- U+1046: "၆" MYANMAR DIGIT SIX -->
             <Key
                 latin:keySpec="&#x1046;"
                 latin:keyHintLabel="6"
-                latin:additionalMoreKeys="6"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="6" />
             <!-- U+1047: "၇" MYANMAR DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x1047;"
                 latin:keyHintLabel="7"
-                latin:additionalMoreKeys="7"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="7" />
             <!-- U+1048: "၈" MYANMAR DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x1048;"
                 latin:keyHintLabel="8"
-                latin:additionalMoreKeys="8"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="8" />
             <!-- U+1049: "၉" MYANMAR DIGIT NINE -->
             <Key
                 latin:keySpec="&#x1049;"
                 latin:keyHintLabel="9"
-                latin:additionalMoreKeys="9"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="9" />
             <!-- U+1040: "၀" MYANMAR DIGIT ZERO -->
             <Key
                 latin:keySpec="&#x1040;"
                 latin:keyHintLabel="0"
-                latin:additionalMoreKeys="0"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="0" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_myanmar2.xml b/java/res/xml/rowkeys_myanmar2.xml
index 5f0115f..d7aca00 100644
--- a/java/res/xml/rowkeys_myanmar2.xml
+++ b/java/res/xml/rowkeys_myanmar2.xml
@@ -18,95 +18,51 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+1017: "ဗ" MYANMAR LETTER BA -->
-            <Key
-                latin:keySpec="&#x1017;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1017;" />
             <!-- U+1012: "ဒ" MYANMAR LETTER DA -->
-            <Key
-                latin:keySpec="&#x1012;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1012;" />
             <!-- U+1013: "ဓ" MYANMAR LETTER DHA -->
-            <Key
-                latin:keySpec="&#x1013;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1013;" />
             <!-- U+1003: "ဃ" MYANMAR LETTER GHA -->
-            <Key
-                latin:keySpec="&#x1003;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1003;" />
             <!-- U+100E: "ဎ" MYANMAR LETTER DDHA -->
-            <Key
-                latin:keySpec="&#x100E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x100E;" />
             <!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA -->
-            <Key
-                latin:keySpec="&#x103F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103F;" />
             <!-- U+100F: "ဏ" MYANMAR LETTER NNA -->
-            <Key
-                latin:keySpec="&#x100F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x100F;" />
             <!-- U+1008: "ဈ" MYANMAR LETTER JHA -->
-            <Key
-                latin:keySpec="&#x1008;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1008;" />
             <!-- U+1007: "ဇ" MYANMAR LETTER JA -->
-            <Key
-                latin:keySpec="&#x1007;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1007;" />
             <!-- U+1002: "ဂ" MYANMAR LETTER GA -->
-            <Key
-                latin:keySpec="&#x1002;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1002;" />
         </case>
         <default>
             <!-- U+1006: "ဆ" MYANMAR LETTER CHA -->
-            <Key
-                latin:keySpec="&#x1006;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1006;" />
             <!-- U+1010: "တ" MYANMAR LETTER TA -->
-            <Key
-                latin:keySpec="&#x1010;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1010;" />
             <!-- U+1014: "န" MYANMAR LETTER NA -->
-            <Key
-                latin:keySpec="&#x1014;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1014;" />
             <!-- U+1019: "မ" MYANMAR LETTER MA -->
-            <Key
-                latin:keySpec="&#x1019;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1019;" />
             <!-- U+1021: "အ" MYANMAR LETTER A -->
-            <Key
-                latin:keySpec="&#x1021;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1021;" />
             <!-- U+1015: "ပ" MYANMAR LETTER PA -->
-            <Key
-                latin:keySpec="&#x1015;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1015;" />
             <!-- U+1000: "က" MYANMAR LETTER KA -->
-            <Key
-                latin:keySpec="&#x1000;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1000;" />
             <!-- U+1004: "င" MYANMAR LETTER NGA -->
-            <Key
-                latin:keySpec="&#x1004;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1004;" />
             <!-- U+101E: "သ" MYANMAR LETTER SA -->
-            <Key
-                latin:keySpec="&#x101E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101E;" />
             <!-- U+1005: "စ" MYANMAR LETTER CA -->
-            <Key
-                latin:keySpec="&#x1005;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1005;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_myanmar3.xml b/java/res/xml/rowkeys_myanmar3.xml
index 612bcd3..c585068 100644
--- a/java/res/xml/rowkeys_myanmar3.xml
+++ b/java/res/xml/rowkeys_myanmar3.xml
@@ -18,106 +18,69 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+101A: "ယ" MYANMAR LETTER YA -->
-            <Key
-                latin:keySpec="&#x101A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101A;" />
             <!-- U+1039: "္" MYANMAR SIGN VIRAMA -->
-            <Key
-                latin:keySpec="&#x1039;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1039;" />
             <!-- U+1004/U+103A/U+1039: "င်္င" MYANMAR LETTER NGA/MYANMAR SIGN ASAT/MYANMAR SIGN VIRAMA -->
             <Key
                 latin:keySpec="&#x1004;&#x103A;&#x1039;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA -->
-            <Key
-                latin:keySpec="&#x103E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103E;" />
             <!-- U+102E: "ီ" MYANMAR VOWEL SIGN II -->
-            <Key
-                latin:keySpec="&#x102E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x102E;" />
             <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
-            <Key
-                latin:keySpec="&#x1030;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1030;" />
             <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->
-            <Key
-                latin:keySpec="&#x102B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x102B;" />
             <!-- U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
-            <Key
-                latin:keySpec="&#x1032;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1032;" />
             <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
-            <Key
-                latin:keySpec="&#x1036;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1036;" />
             <!-- U+101F: "ဟ" MYANMAR LETTER HA -->
-            <Key
-                latin:keySpec="&#x101F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101F;" />
         </case>
         <default>
             <!-- U+1031: "ေ" MYANMAR VOWEL SIGN E -->
-            <Key
-                latin:keySpec="&#x1031;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1031;" />
             <!-- U+103B: "ျ" MYANMAR CONSONANT SIGN MEDIAL YA -->
-            <Key
-                latin:keySpec="&#x103B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103B;" />
             <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA -->
-            <Key
-                latin:keySpec="&#x103C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103C;" />
             <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA
                  U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA
                  U+103D/U+103E: "ွှ" MYANMAR CONSONANT SIGN MEDIAL WA/MYANMAR CONSONANT SIGN MEDIAL HA -->
             <Key
                 latin:keySpec="&#x103D;"
-                latin:moreKeys="&#x103E;,&#x103D;&#x103E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x103E;,&#x103D;&#x103E;" />
             <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I
                  U+102E: "ီ" MYANMAR VOWEL SIGN II -->
             <Key
                 latin:keySpec="&#x102D;"
-                latin:moreKeys="&#x102E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x102E;" />
             <!-- U+102F: "ု" MYANMAR VOWEL SIGN U
                  U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
             <Key
                 latin:keySpec="&#x102F;"
-                latin:moreKeys="&#x1030;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1030;" />
             <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA -->
-            <Key
-                latin:keySpec="&#x102C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x102C;" />
             <!-- U+103A: "်" MYANMAR SIGN ASAT
                  U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
             <Key
                 latin:keySpec="&#x103A;"
-                latin:moreKeys="&#x1032;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1032;" />
             <!-- U+1037: "့" MYANMAR SIGN DOT BELOW
                  U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
             <Key
                 latin:keySpec="&#x1037;"
-                latin:moreKeys="&#x1036;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1036;" />
             <!-- U+1038: "း" MYANMAR SIGN VISARGA -->
-            <Key
-                latin:keySpec="&#x1038;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1038;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_myanmar4.xml b/java/res/xml/rowkeys_myanmar4.xml
index 57466c5..210ebaa 100644
--- a/java/res/xml/rowkeys_myanmar4.xml
+++ b/java/res/xml/rowkeys_myanmar4.xml
@@ -18,83 +18,52 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+1025: "ဥ" MYANMAR LETTER U -->
-            <Key
-                latin:keySpec="&#x1025;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1025;" />
             <!-- U+1026: "ဦ" MYANMAR LETTER UU -->
-            <Key
-                latin:keySpec="&#x1026;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1026;" />
             <!-- U+100C: "ဌ" MYANMAR LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x100C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x100C;" />
             <!-- U+100B: "ဋ" MYANMAR LETTER TTA -->
-            <Key
-                latin:keySpec="&#x100B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x100B;" />
             <!-- U+100D: "ဍ" MYANMAR LETTER DDA -->
-            <Key
-                latin:keySpec="&#x100D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x100D;" />
             <!-- U+1020: "ဠ" MYANMAR LETTER LLA -->
-            <Key
-                latin:keySpec="&#x1020;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1020;" />
             <!-- U+100B/U+1039/U+100C: "ဋ္ဌ" MYANMAR LETTER TTA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA -->
             <Key
                 latin:keySpec="&#x100B;&#x1039;&#x100C;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+100F/U+1039/U+100D: "ဏ္ဍ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER DDA
                  U+100F/U+1039/U+100C: "ဏ္ဌ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA -->
             <Key
                 latin:keySpec="&#x100F;&#x1039;&#x100D;"
                 latin:moreKeys="&#x100F;&#x1039;&#x100C;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
         </case>
         <default>
             <!-- U+1016: "ဖ" MYANMAR LETTER PHA -->
-            <Key
-                latin:keySpec="&#x1016;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1016;" />
             <!-- U+1011: "ထ" MYANMAR LETTER THA -->
-            <Key
-                latin:keySpec="&#x1011;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1011;" />
             <!-- U+1001: "ခ" MYANMAR LETTER KHA -->
-            <Key
-                latin:keySpec="&#x1001;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1001;" />
             <!-- U+101C: "လ" MYANMAR LETTER LA -->
-            <Key
-                latin:keySpec="&#x101C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101C;" />
             <!-- U+1018: "ဘ" MYANMAR LETTER BHA -->
-            <Key
-                latin:keySpec="&#x1018;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1018;" />
             <!-- U+100A: "ည" MYANMAR LETTER NNYA
                  U+1009: "ဉ" MYANMAR LETTER NYA -->
             <Key
                 latin:keySpec="&#x100A;"
-                latin:moreKeys="&#x1009;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1009;" />
             <!-- U+101B: "ရ" MYANMAR LETTER RA -->
-            <Key
-                latin:keySpec="&#x101B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101B;" />
             <!-- U+101D: "ဝ" MYANMAR LETTER WA -->
-            <Key
-                latin:keySpec="&#x101D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101D;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized1.xml b/java/res/xml/rowkeys_nepali_romanized1.xml
index 616b259..67be51b 100644
--- a/java/res/xml/rowkeys_nepali_romanized1.xml
+++ b/java/res/xml/rowkeys_nepali_romanized1.xml
@@ -18,89 +18,60 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x0920;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0920;" />
             <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
-            <Key
-                latin:keySpec="&#x0914;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0914;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAi" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
             <!-- U+0925: "थ" DEVANAGARI LETTER THA -->
-            <Key
-                latin:keySpec="&#x0925;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0925;" />
             <!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
-            <Key
-                latin:keySpec="&#x091E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091E;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignUu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignIi" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" />
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
-            <Key
-                latin:keySpec="&#x0913;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0913;" />
             <!-- U+092B: "फ" DEVANAGARI LETTER PHA -->
-            <Key
-                latin:keySpec="&#x092B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092B;" />
             <!-- U+0908: "ई" DEVANAGARI LETTER II -->
-            <Key
-                latin:keySpec="&#x0908;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0908;" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
             <!-- U+091F: "ट" DEVANAGARI LETTER TTA
                  U+0967: "१" DEVANAGARI DIGIT ONE -->
             <Key
                 latin:keySpec="&#x091F;"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="&#x0967;,1"
-                latin:keyStyle="moreKeysDevanagariSignNukta"
-                latin:keyLabelFlags="fontNormal" />
+                latin:keyStyle="moreKeysDevanagariSignNukta" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
             <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignAu"
@@ -109,8 +80,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
             <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignE"
@@ -121,27 +91,23 @@
             <Key
                 latin:keySpec="&#x0930;"
                 latin:keyHintLabel="4"
-                latin:additionalMoreKeys="&#x096A;,4"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096A;,4" />
             <!-- U+0924: "त" DEVANAGARI LETTER TA
                  U+096B: "५" DEVANAGARI DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x0924;"
                 latin:keyHintLabel="5"
-                latin:additionalMoreKeys="&#x096B;,5"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096B;,5" />
             <!-- U+092F: "य" DEVANAGARI LETTER YA
                  U+096C: "६" DEVANAGARI DIGIT SIX -->
             <Key
                 latin:keySpec="&#x092F;"
                 latin:keyHintLabel="6"
-                latin:additionalMoreKeys="&#x096C;,6"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096C;,6" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
             <!-- U+096D: "७" DEVANAGARI DIGIT SEVEN -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignU"
@@ -150,8 +116,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
             <!-- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignI"
@@ -160,8 +125,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
             <!-- U+096F: "९" DEVANAGARI DIGIT NINE -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignO"
@@ -172,12 +136,9 @@
             <Key
                 latin:keySpec="&#x092A;"
                 latin:keyHintLabel="0"
-                latin:additionalMoreKeys="&#x0966;,0"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0966;,0" />
             <!-- U+0907: "इ" DEVANAGARI LETTER I -->
-            <Key
-                latin:keySpec="&#x0907;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+            <Key latin:keySpec="&#x0907;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized2.xml b/java/res/xml/rowkeys_nepali_romanized2.xml
index 561ae6c..2e2583c 100644
--- a/java/res/xml/rowkeys_nepali_romanized2.xml
+++ b/java/res/xml/rowkeys_nepali_romanized2.xml
@@ -18,109 +18,61 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
-            <Key
-                latin:keySpec="&#x0906;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0906;" />
             <!-- U+0936: "श" DEVANAGARI LETTER SHA -->
-            <Key
-                latin:keySpec="&#x0936;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0936;" />
             <!-- U+0927: "ध" DEVANAGARI LETTER DHA -->
-            <Key
-                latin:keySpec="&#x0927;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0927;" />
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
-            <Key
-                latin:keySpec="&#x090A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x090A;" />
             <!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
-            <Key
-                latin:keySpec="&#x0918;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0918;" />
             <!-- U+0905: "अ" DEVANAGARI LETTER A -->
-            <Key
-                latin:keySpec="&#x0905;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0905;" />
             <!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
-            <Key
-                latin:keySpec="&#x091D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091D;" />
             <!-- U+0916: "ख" DEVANAGARI LETTER KHA -->
-            <Key
-                latin:keySpec="&#x0916;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0916;" />
             <!-- U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
-            <Key
-                latin:keySpec="&#x0965;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0965;" />
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
-            <Key
-                latin:keySpec="&#x0910;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0910;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVisarga" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVisarga" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAa" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" />
             <!-- U+0938: "स" DEVANAGARI LETTER SA -->
-            <Key
-                latin:keySpec="&#x0938;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0938;" />
             <!-- U+0926: "द" DEVANAGARI LETTER DA -->
-            <Key
-                latin:keySpec="&#x0926;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0926;" />
             <!-- U+0909: "उ" DEVANAGARI LETTER U -->
-            <Key
-                latin:keySpec="&#x0909;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0909;" />
             <!-- U+0917: "ग" DEVANAGARI LETTER GA -->
-            <Key
-                latin:keySpec="&#x0917;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0917;" />
             <!-- U+0939: "ह" DEVANAGARI LETTER HA -->
-            <Key
-                latin:keySpec="&#x0939;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0939;" />
             <!-- U+091C: "ज" DEVANAGARI LETTER JA -->
-            <Key
-                latin:keySpec="&#x091C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091C;" />
             <!-- U+0915: "क" DEVANAGARI LETTER KA -->
-            <Key
-                latin:keySpec="&#x0915;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0915;" />
             <!-- U+0932: "ल" DEVANAGARI LETTER LA -->
-            <Key
-                latin:keySpec="&#x0932;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0932;" />
             <!-- U+090F: "ए" DEVANAGARI LETTER E -->
-            <Key
-                latin:keySpec="&#x090F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x090F;" />
             <!-- U+0950: "ॐ" DEVANAGARI OM -->
-            <Key
-                latin:keySpec="&#x0950;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+            <Key latin:keySpec="&#x0950;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized3.xml b/java/res/xml/rowkeys_nepali_romanized3.xml
index cc2ca8c..24f5908 100644
--- a/java/res/xml/rowkeys_nepali_romanized3.xml
+++ b/java/res/xml/rowkeys_nepali_romanized3.xml
@@ -18,101 +18,62 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
-            <Key
-                latin:keySpec="&#x090B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x090B;" />
             <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
-            <Key
-                latin:keySpec="&#x0922;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0922;" />
             <!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
-            <Key
-                latin:keySpec="&#x091B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091B;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+            <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
             <!-- U+092D: "भ" DEVANAGARI LETTER BHA -->
-            <Key
-                latin:keySpec="&#x092D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092D;" />
             <!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
-            <Key
-                latin:keySpec="&#x0923;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0923;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
             <!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
-            <Key
-                latin:keySpec="&#x0919;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0919;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVirama" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
         </case>
         <default>
             <!-- U+0937: "ष" DEVANAGARI LETTER SSA -->
-            <Key
-                latin:keySpec="&#x0937;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0937;" />
             <!-- U+0921: "ड" DEVANAGARI LETTER DDA -->
-            <Key
-                latin:keySpec="&#x0921;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0921;" />
             <!-- U+091A: "च" DEVANAGARI LETTER CA -->
-            <Key
-                latin:keySpec="&#x091A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091A;" />
             <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-            <Key
-                latin:keySpec="&#x0935;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0935;" />
             <!-- U+092C: "ब" DEVANAGARI LETTER BHA -->
-            <Key
-                latin:keySpec="&#x092C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092C;" />
             <!-- U+0928: "न" DEVANAGARI LETTER NA -->
-            <Key
-                latin:keySpec="&#x0928;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0928;" />
             <!-- U+092E: "म" DEVANAGARI LETTER MA -->
-            <Key
-                latin:keySpec="&#x092E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092E;" />
             <!-- U+0964: "।" DEVANAGARI DANDA
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
             <Key
                 latin:keySpec="&#x0964;"
-                latin:moreKeys="&#x093D;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x093D;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVirama" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional1.xml b/java/res/xml/rowkeys_nepali_traditional1.xml
index cf4bda9..73b2275 100644
--- a/java/res/xml/rowkeys_nepali_traditional1.xml
+++ b/java/res/xml/rowkeys_nepali_traditional1.xml
@@ -18,13 +18,9 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0924/U+094D/U+0924: "त्त" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TA
                  U+091E: "ञ" DEVANAGARI LETTER NYA
                  U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
@@ -32,68 +28,62 @@
             <Key
                 latin:keySpec="&#x0924;&#x094D;&#x0924;"
                 latin:moreKeys="&#x091E;,&#x091C;&#x094D;&#x091E;,&#x0965;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0921/U+094D/U+0922: "ड्ढ" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDHA
                  U+0908: "ई" DEVANAGARI LETTER II -->
             <Key
                 latin:keySpec="&#x0921;&#x094D;&#x0922;"
                 latin:moreKeys="&#x0908;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI
                  U+0918: "घ" DEVANAGARI LETTER GHA -->
             <Key
                 latin:keySpec="&#x0910;"
-                latin:moreKeys="&#x0918;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0918;" />
             <!-- U+0926/U+094D/U+0935: "द्व" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER VA
                  U+0926/U+094D/U+0927: "द्ध" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DHA -->
             <Key
                 latin:keySpec="&#x0926;&#x094D;&#x0935;"
                 latin:moreKeys="&#x0926;&#x094D;&#x0927;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+091F/U+094D/U+091F: "ट्ट" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTA
                  U+091B: "छ" DEVANAGARI LETTER CHA -->
             <Key
                 latin:keySpec="&#x091F;&#x094D;&#x091F;"
                 latin:moreKeys="&#x091B;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0920/U+094D/U+0920: "ठ्ठ" DEVANAGARI LETTER TTHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA
                  U+091F: "ट" DEVANAGARI LETTER TTA -->
             <Key
                 latin:keySpec="&#x0920;&#x094D;&#x0920;"
                 latin:moreKeys="&#x091F;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU
                  U+0920: "ठ" DEVANAGARI LETTER TTHA -->
             <Key
                 latin:keySpec="&#x090A;"
-                latin:moreKeys="&#x0920;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0920;" />
             <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
                  U+0921: "ड" DEVANAGARI LETTER DDA -->
             <Key
                 latin:keySpec="&#x0915;&#x094D;&#x0937;"
                 latin:moreKeys="&#x0921;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0907: "इ" DEVANAGARI LETTER I
                  U+0922: "ढ" DEVANAGARI LETTER DDHA -->
             <Key
                 latin:keySpec="&#x0907;"
-                latin:moreKeys="&#x0922;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0922;" />
             <!-- U+090F: "ए" DEVANAGARI LETTER E
                  U+0923: "ण" DEVANAGARI LETTER NNA -->
             <Key
                 latin:keySpec="&#x090F;"
-                latin:moreKeys="&#x0923;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0923;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
         </case>
         <default>
             <!-- U+091F: "ट" DEVANAGARI LETTER TTA
@@ -101,77 +91,66 @@
             <Key
                 latin:keySpec="&#x091F;"
                 latin:keyHintLabel="1"
-                latin:additionalMoreKeys="&#x0967;,1"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0967;,1" />
             <!-- U+0927: "ध" DEVANAGARI LETTER DHA
                  U+0968: "२" DEVANAGARI DIGIT TWO -->
             <Key
                 latin:keySpec="&#x0927;"
                 latin:keyHintLabel="2"
-                latin:additionalMoreKeys="&#x0968;,2"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0968;,2" />
             <!-- U+092D: "भ" DEVANAGARI LETTER BHA
                  U+0969: "३" DEVANAGARI DIGIT THREE -->
             <Key
                 latin:keySpec="&#x092D;"
                 latin:keyHintLabel="3"
-                latin:additionalMoreKeys="&#x0969;,3"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0969;,3" />
             <!-- U+091A: "च" DEVANAGARI LETTER CA
                  U+096A: "४" DEVANAGARI DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x091A;"
                 latin:keyHintLabel="4"
-                latin:additionalMoreKeys="&#x096A;,4"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096A;,4" />
             <!-- U+0924: "त" DEVANAGARI LETTER TA
                  U+096B: "५" DEVANAGARI DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x0924;"
                 latin:keyHintLabel="5"
-                latin:additionalMoreKeys="&#x096B;,5"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096B;,5" />
             <!-- U+0925: "थ" DEVANAGARI LETTER THA
                  U+096C: "६" DEVANAGARI DIGIT SIX -->
             <Key
                 latin:keySpec="&#x0925;"
                 latin:keyHintLabel="6"
-                latin:additionalMoreKeys="&#x096C;,6"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096C;,6" />
             <!-- U+0917: "ग" DEVANAGARI LETTER G
                  U+096D: "७" DEVANAGARI DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x0917;"
                 latin:keyHintLabel="7"
-                latin:additionalMoreKeys="&#x096D;,7"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096D;,7" />
             <!-- U+0937: "ष" DEVANAGARI LETTER SSA
                  U+096E: "८" DEVANAGARI DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x0937;"
                 latin:keyHintLabel="8"
-                latin:additionalMoreKeys="&#x096E;,8"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096E;,8" />
             <!-- U+092F: "य" DEVANAGARI LETTER YA
                  U+096F: "९" DEVANAGARI DIGIT NINE -->
             <Key
                 latin:keySpec="&#x092F;"
                 latin:keyHintLabel="9"
-                latin:additionalMoreKeys="&#x096F;,9"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096F;,9" />
             <!-- U+0909: "उ" DEVANAGARI LETTER U
                  U+0966: "०" DEVANAGARI DIGIT ZERO -->
             <Key
                 latin:keySpec="&#x0909;"
                 latin:keyHintLabel="0"
-                latin:additionalMoreKeys="&#x0966;,0"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0966;,0" />
             <!-- U+0907: "इ" DEVANAGARI LETTER I
                  U+0914: "औ" DEVANAGARI LETTER AU -->
             <Key
                 latin:keySpec="&#x0907;"
-                latin:moreKeys="&#x0914;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+                latin:moreKeys="&#x0914;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional2.xml b/java/res/xml/rowkeys_nepali_traditional2.xml
index 58a463e..c443daf 100644
--- a/java/res/xml/rowkeys_nepali_traditional2.xml
+++ b/java/res/xml/rowkeys_nepali_traditional2.xml
@@ -18,124 +18,84 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
-            <Key
-                latin:keySpec="&#x0906;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0906;" />
             <!-- U+0919/U+094D: "ङ्" DEVANAGARI LETTER NGA/DEVANAGARI SIGN VIRAMA -->
             <Key
                 latin:keySpec="&#x0919;&#x094D;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0921/U+094D/U+0921: "ड्ड" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDA -->
             <Key
                 latin:keySpec="&#x0921;&#x094D;&#x0921;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+            <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
             <!-- U+0926/U+094D/U+0926: "द्द" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DA -->
             <Key
                 latin:keySpec="&#x0926;&#x094D;&#x0926;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
-            <Key
-                latin:keySpec="&#x091D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091D;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignO" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
             <!-- U+092B: "फ" DEVANAGARI LETTER PHA -->
-            <Key
-                latin:keySpec="&#x092B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092B;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignIi" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" />
             <!-- U+091F/U+094D/U+0920: "ट्ठ" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA -->
             <Key
                 latin:keySpec="&#x091F;&#x094D;&#x0920;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignUu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" />
         </case>
         <default>
             <!-- U+092C: "ब" DEVANAGARI LETTER BA -->
-            <Key
-                latin:keySpec="&#x092C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092C;" />
             <!-- U+0915: "क" DEVANAGARI LETTER KA -->
-            <Key
-                latin:keySpec="&#x0915;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0915;" />
             <!-- U+092E: "म" DEVANAGARI LETTER MA -->
-            <Key
-                latin:keySpec="&#x092E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092E;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAa" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" />
             <!-- U+0928: "न" DEVANAGARI LETTER NA -->
-            <Key
-                latin:keySpec="&#x0928;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0928;" />
             <!-- U+091C: "ज" DEVANAGARI LETTER JA -->
-            <Key
-                latin:keySpec="&#x091C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091C;" />
             <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-            <Key
-                latin:keySpec="&#x0935;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0935;" />
             <!-- U+092A: "प" DEVANAGARI LETTER PA -->
-            <Key
-                latin:keySpec="&#x092A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092A;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignI" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
             <!-- U+0938: "स" DEVANAGARI LETTER SA -->
-            <Key
-                latin:keySpec="&#x0938;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0938;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignU" />
-         </default>
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional3_left6.xml b/java/res/xml/rowkeys_nepali_traditional3_left6.xml
index 59f6e65..ade2787 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_left6.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_left6.xml
@@ -18,66 +18,44 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0915/U+094D: "क्" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA -->
             <Key
                 latin:keySpec="&#x0915;&#x094D;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0939/U+094D/U+092E: "ह्म" DEVANAGARI LETTER HA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER MA -->
             <Key
                 latin:keySpec="&#x0939;&#x094D;&#x092E;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
-            <Key
-                latin:keySpec="&#x090B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x090B;" />
             <!-- U+0950: "ॐ" DEVANAGARI OM -->
-            <Key
-                latin:keySpec="&#x0950;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0950;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAu" />
             <!-- U+0926/U+094D/U+092F: "द्य" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER YA -->
             <Key
                 latin:keySpec="&#x0926;&#x094D;&#x092F;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
         </case>
         <default>
             <!-- U+0936: "श" DEVANAGARI LETTER SHA -->
-            <Key
-                latin:keySpec="&#x0936;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0936;" />
             <!-- U+0939: "ह" DEVANAGARI LETTER HA -->
-            <Key
-                latin:keySpec="&#x0939;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0939;" />
             <!-- U+0905: "अ" DEVANAGARI LETTER A -->
-            <Key
-                latin:keySpec="&#x0905;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0905;" />
             <!-- U+0916: "ख" DEVANAGARI LETTER KHA -->
-            <Key
-                latin:keySpec="&#x0916;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0916;" />
             <!-- U+0926: "द" DEVANAGARI LETTER DA -->
-            <Key
-                latin:keySpec="&#x0926;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0926;" />
             <!-- U+0932: "ल" DEVANAGARI LETTER LA -->
-            <Key
-                latin:keySpec="&#x0932;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0932;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional3_right3.xml b/java/res/xml/rowkeys_nepali_traditional3_right3.xml
index 3e6187d..4db438d 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_right3.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_right3.xml
@@ -18,50 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
             <!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
-            <Key
-                latin:keySpec="&#x0919;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0919;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAi" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignE" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
             <!-- U+0964: "।" DEVANAGARI DANDA -->
-            <Key
-                latin:keySpec="&#x0964;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0964;" />
             <!-- U+0930: "र" DEVANAGARI LETTER RA
                  U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U -->
             <Key
                 latin:keySpec="&#x0930;"
-                latin:moreKeys="&#x0930;&#x0941;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+                latin:moreKeys="&#x0930;&#x0941;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional3_right5.xml b/java/res/xml/rowkeys_nepali_traditional3_right5.xml
index 89d5aa4..c7c73a4 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_right5.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_right5.xml
@@ -18,45 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
             <!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
-            <Key
-                latin:keySpec="&#x0919;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0919;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAi" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" />
             <!-- U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U -->
             <Key
                 latin:keySpec="&#x0930;&#x0941;"
                 latin:moreKeys="!"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <Key
-                latin:keySpec="\?" />
+                latin:keySpec="\?"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
             <!-- U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
             <Key
                 latin:keyStyle="baseKeyDevanagariSignVisarga"
@@ -64,27 +54,20 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
             <!-- Override more keys with empty definition -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignE" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
             <!-- U+0964: "।" DEVANAGARI DANDA -->
-            <Key
-                latin:keySpec="&#x0964;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0964;" />
             <!-- U+0930: "र" DEVANAGARI LETTER RA -->
             <Key
                 latin:keySpec="&#x0930;"
-                latin:moreKeys="!"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="!" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
             <Key
                 latin:keyStyle="baseKeyDevanagariSignVirama"
                 latin:moreKeys="\?" />
diff --git a/java/res/xml/rowkeys_sinhala1.xml b/java/res/xml/rowkeys_sinhala1.xml
index f258ae2..fcad5ea 100644
--- a/java/res/xml/rowkeys_sinhala1.xml
+++ b/java/res/xml/rowkeys_sinhala1.xml
@@ -18,107 +18,94 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0DD6: "ූ" SINHALA VOWEL SIGN DIGA PAA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD6;"
-                latin:additionalMoreKeys="1" />
+            <Key latin:keySpec="&#x0DD6;" />
             <!-- U+0D8B: "උ" SINHALA LETTER UYANNA -->
-            <Key
-                latin:keySpec="&#x0D8B;"
-                latin:additionalMoreKeys="2" />
+            <Key latin:keySpec="&#x0D8B;" />
             <!-- U+0DD1: "ෑ" SINHALA VOWEL SIGN DIGA AEDA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD1;"
-                latin:additionalMoreKeys="3" />
+            <Key latin:keySpec="&#x0DD1;" />
             <!-- U+0D8D: "ඍ" SINHALA LETTER IRUYANNA -->
-            <Key
-                latin:keySpec="&#x0D8D;"
-                latin:additionalMoreKeys="4" />
+            <Key latin:keySpec="&#x0D8D;" />
             <!-- U+0D94: "ඔ" SINHALA LETTER OYANNA -->
-            <Key
-                latin:keySpec="&#x0D94;"
-                latin:additionalMoreKeys="5" />
+            <Key latin:keySpec="&#x0D94;" />
             <!-- U+0DC1: "ශ" SINHALA LETTER TAALUJA SAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC1;"
-                latin:additionalMoreKeys="6" />
+            <Key latin:keySpec="&#x0DC1;" />
             <!-- U+0DB9: "ඹ" SINHALA LETTER AMBA BAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB9;"
-                latin:additionalMoreKeys="7" />
+            <Key latin:keySpec="&#x0DB9;" />
             <!-- U+0DC2: "ෂ" SINHALA LETTER MUURDHAJA SAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC2;"
-                latin:additionalMoreKeys="8" />
+            <Key latin:keySpec="&#x0DC2;" />
             <!-- U+0DB0: "ධ" SINHALA LETTER MAHAAPRAANA DAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB0;"
-                latin:additionalMoreKeys="9" />
+            <Key latin:keySpec="&#x0DB0;" />
             <!-- U+0DA1: "ඡ" SINHALA LETTER MAHAAPRAANA CAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA1;"
-                latin:additionalMoreKeys="0" />
+            <Key latin:keySpec="&#x0DA1;" />
             <!-- U+0DA5: "ඥ" SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA
                  U+0DF4: "෴" SINHALA PUNCTUATION KUNDDALIYA  -->
             <Key
                 latin:keySpec="&#x0DA5;"
-                latin:moreKeys="&#x0DF4;" />
+                latin:moreKeys="&#x0DF4;"
+                latin:keyLabelFlags="autoXScale" />
         </case>
         <default>
             <!-- U+0DD4: "ු" SINHALA VOWEL SIGN KETTI PAA-PILLA -->
             <Key
                 latin:keySpec="&#x0DD4;"
+                latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1" />
             <!-- U+0D85: "අ" SINHALA LETTER AYANNA -->
             <Key
                 latin:keySpec="&#x0D85;"
+                latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2" />
             <!-- U+0DD0: "ැ" SINHALA VOWEL SIGN KETTI AEDA-PILLA -->
             <Key
                 latin:keySpec="&#x0DD0;"
+                latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3" />
             <!-- U+0DBB: "ර" SINHALA LETTER RAYANNA -->
             <Key
                 latin:keySpec="&#x0DBB;"
+                latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4" />
             <!-- U+0D91: "එ" SINHALA LETTER EYANNA -->
             <Key
                 latin:keySpec="&#x0D91;"
+                latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5" />
             <!-- U+0DC4: "හ" SINHALA LETTER HAYANNA -->
             <Key
                 latin:keySpec="&#x0DC4;"
+                latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6" />
             <!-- U+0DB8: "ම" SINHALA LETTER MAYANNA -->
             <Key
                 latin:keySpec="&#x0DB8;"
+                latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7" />
             <!-- U+0DC3: "ස" SINHALA LETTER DANTAJA SAYANNA -->
             <Key
                 latin:keySpec="&#x0DC3;"
+                latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8" />
             <!-- U+0DAF: "ද" SINHALA LETTER ALPAPRAANA DAYANNA
                  U+0DB3: "ඳ" SINHALA LETTER SANYAKA DAYANNA -->
             <Key
                 latin:keySpec="&#x0DAF;"
                 latin:moreKeys="&#x0DB3;"
+                latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9" />
             <!-- U+0DA0: "ච" SINHALA LETTER ALPAPRAANA CAYANNA -->
             <Key
                 latin:keySpec="&#x0DA0;"
+                latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0" />
             <!-- U+0DA4: "ඤ" SINHALA LETTER TAALUJA NAASIKYAYA
                  U+0DF4: "෴" SINHALA PUNCTUATION KUNDDALIYA -->
             <Key
                 latin:keySpec="&#x0DA4;"
                 latin:moreKeys="&#x0DF4;" />
-         </default>
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_sinhala2.xml b/java/res/xml/rowkeys_sinhala2.xml
index 91c1928..92c1e08 100644
--- a/java/res/xml/rowkeys_sinhala2.xml
+++ b/java/res/xml/rowkeys_sinhala2.xml
@@ -18,81 +18,55 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0DDF: "ෟ" SINHALA VOWEL SIGN GAYANUKITTA -->
-            <Key
-                latin:keySpec="&#x0DDF;" />
+            <Key latin:keySpec="&#x0DDF;" />
             <!-- U+0DD3: "ී" SINHALA VOWEL SIGN DIGA IS-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD3;" />
+            <Key latin:keySpec="&#x0DD3;" />
             <!-- U+0DD8: "ෘ" SINHALA VOWEL SIGN GAETTA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD8;" />
+            <Key latin:keySpec="&#x0DD8;" />
             <!-- U+0DC6: "ෆ" SINHALA LETTER FAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC6;" />
+            <Key latin:keySpec="&#x0DC6;" />
             <!-- U+0DA8: "ඨ" SINHALA LETTER MAHAAPRAANA TTAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA8;" />
+            <Key latin:keySpec="&#x0DA8;" />
             <!-- U+0DCA/U+200D/U+0DBA: "්‍ය" SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER/SINHALA LETTER YAYANNA -->
-            <Key
-                latin:keySpec="&#x0DCA;&#x200D;&#x0DBA;" />
+            <Key latin:keySpec="&#x0DCA;&#x200D;&#x0DBA;" />
             <!-- U+0DC5/U+0DD4: "ළු" SINHALA LETTER MUURDHAJA LAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DC5;&#x0DD4;" />
+            <Key latin:keySpec="&#x0DC5;&#x0DD4;" />
             <!-- U+0DAB: "ණ" SINHALA LETTER MUURDHAJA NAYANNA -->
-            <Key
-                latin:keySpec="&#x0DAB;" />
+            <Key latin:keySpec="&#x0DAB;" />
             <!-- U+0D9B: "ඛ" SINHALA LETTER MAHAAPRAANA KAYANNA -->
-            <Key
-                latin:keySpec="&#x0D9B;" />
+            <Key latin:keySpec="&#x0D9B;" />
             <!-- U+0DAE: "ථ" SINHALA LETTER MAHAAPRAANA TAYANNA -->
-            <Key
-                latin:keySpec="&#x0DAE;" />
+            <Key latin:keySpec="&#x0DAE;" />
             <!-- U+0DCA/U+200D/U+0DBB: "්‍ර" SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER/SINHALA LETTER RAYANNA -->
-            <Key
-                latin:keySpec="&#x0DCA;&#x200D;&#x0DBB;" />
+            <Key latin:keySpec="&#x0DCA;&#x200D;&#x0DBB;" />
         </case>
         <default>
             <!-- U+0DCA: "්" SINHALA SIGN AL-LAKUNA -->
-            <Key
-                latin:keySpec="&#x0DCA;" />
+            <Key latin:keySpec="&#x0DCA;" />
             <!-- U+0DD2: "ි" SINHALA VOWEL SIGN KETTI IS-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD2;" />
+            <Key latin:keySpec="&#x0DD2;" />
             <!-- U+0DCF: "ා" SINHALA VOWEL SIGN AELA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DCF;" />
+            <Key latin:keySpec="&#x0DCF;" />
             <!-- U+0DD9: "ෙ" SINHALA VOWEL SIGN KOMBUVA -->
-            <Key
-                latin:keySpec="&#x0DD9;" />
+            <Key latin:keySpec="&#x0DD9;" />
             <!-- U+0DA7: "ට" SINHALA LETTER ALPAPRAANA TTAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA7;" />
+            <Key latin:keySpec="&#x0DA7;" />
             <!-- U+0DBA: "ය" SINHALA LETTER YAYANNA -->
-            <Key
-                latin:keySpec="&#x0DBA;" />
+            <Key latin:keySpec="&#x0DBA;" />
             <!-- U+0DC0: "ව" SINHALA LETTER VAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC0;" />
+            <Key latin:keySpec="&#x0DC0;" />
             <!-- U+0DB1: "න" SINHALA LETTER DANTAJA NAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB1;" />
+            <Key latin:keySpec="&#x0DB1;" />
             <!-- U+0D9A: "ක" SINHALA LETTER ALPAPRAANA KAYANNA -->
-            <Key
-                latin:keySpec="&#x0D9A;" />
+            <Key latin:keySpec="&#x0D9A;" />
             <!-- U+0DAD: "ත" SINHALA LETTER ALPAPRAANA TAYANNA -->
-            <Key
-                latin:keySpec="&#x0DAD;" />
+            <Key latin:keySpec="&#x0DAD;" />
             <!-- U+0D8F: "ඏ" SINHALA LETTER ILUYANNA -->
-            <Key
-                latin:keySpec="&#x0D8F;" />
-         </default>
+            <Key latin:keySpec="&#x0D8F;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_sinhala3.xml b/java/res/xml/rowkeys_sinhala3.xml
index 64ba9f3..8727875 100644
--- a/java/res/xml/rowkeys_sinhala3.xml
+++ b/java/res/xml/rowkeys_sinhala3.xml
@@ -18,40 +18,27 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0D9E: "ඞ" SINHALA LETTER KANTAJA NAASIKYAYA -->
-            <Key
-                latin:keySpec="&#x0D9E;" />
+            <Key latin:keySpec="&#x0D9E;" />
             <!-- U+0DA3: "ඣ" SINHALA LETTER MAHAAPRAANA JAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA3;" />
+            <Key latin:keySpec="&#x0DA3;" />
             <!-- U+0DAA: "ඪ" SINHALA LETTER MAHAAPRAANA DDAYANNA -->
-            <Key
-                latin:keySpec="&#x0DAA;" />
+            <Key latin:keySpec="&#x0DAA;" />
             <!-- U+0D8A: "ඊ" SINHALA LETTER IIYANNA -->
-            <Key
-                latin:keySpec="&#x0D8A;" />
+            <Key latin:keySpec="&#x0D8A;" />
             <!-- U+0DB7: "භ" SINHALA LETTER MAHAAPRAANA BAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB7;" />
+            <Key latin:keySpec="&#x0DB7;" />
             <!-- U+0DB5: "ඵ" SINHALA LETTER MAHAAPRAANA PAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB5;" />
+            <Key latin:keySpec="&#x0DB5;" />
             <!-- U+0DC5: "ළ" SINHALA LETTER MUURDHAJA LAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC5;" />
+            <Key latin:keySpec="&#x0DC5;" />
             <!-- U+0D9D: "ඝ" SINHALA LETTER MAHAAPRAANA GAYANNA -->
-            <Key
-                latin:keySpec="&#x0D9D;" />
+            <Key latin:keySpec="&#x0D9D;" />
             <!-- U+0DBB/U+0DCA/U+200D: "ර්‍" SINHALA LETTER RAYANNA/SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER -->
-            <Key
-                latin:keySpec="&#x0DBB;&#x0DCA;&#x200D;" />
+            <Key latin:keySpec="&#x0DBB;&#x0DCA;&#x200D;" />
         </case>
         <default>
             <!-- U+0D82: "ං" SINHALA SIGN ANUSVARAYA
@@ -70,25 +57,20 @@
                 latin:keySpec="&#x0DA9;"
                 latin:moreKeys="&#x0DAC;" />
             <!-- U+0D89: "ඉ" SINHALA LETTER IYANNA -->
-            <Key
-                latin:keySpec="&#x0D89;" />
+            <Key latin:keySpec="&#x0D89;" />
             <!-- U+0DB6: "බ" SINHALA LETTER ALPAPRAANA BAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB6;" />
+            <Key latin:keySpec="&#x0DB6;" />
             <!-- U+0DB4: "ප" SINHALA LETTER ALPAPRAANA PAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB4;" />
+            <Key latin:keySpec="&#x0DB4;" />
             <!-- U+0DBD: "ල" SINHALA LETTER DANTAJA LAYANNA -->
-            <Key
-                latin:keySpec="&#x0DBD;" />
+            <Key latin:keySpec="&#x0DBD;" />
             <!-- U+0D9C: "ග" SINHALA LETTER ALPAPRAANA GAYANNA
                  U+0D9F: "ඟ" SINHALA LETTER SANYAKA GAYANNA -->
             <Key
                 latin:keySpec="&#x0D9C;"
                 latin:moreKeys="&#x0D9F;" />
             <!-- U+0DF3: "ෳ" SINHALA VOWEL SIGN DIGA GAYANUKITTA -->
-            <Key
-                latin:keySpec="&#x0DF3;" />
-         </default>
+            <Key latin:keySpec="&#x0DF3;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml
index e42bda3..864bca8 100644
--- a/java/res/xml/rowkeys_thai1.xml
+++ b/java/res/xml/rowkeys_thai1.xml
@@ -18,150 +18,120 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <Key
-                latin:keySpec="+" />
+                latin:keySpec="+"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E51: "๑" THAI DIGIT ONE -->
-            <Key
-                latin:keySpec="&#x0E51;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E51;" />
             <!-- U+0E52: "๒" THAI DIGIT TWO -->
-            <Key
-                latin:keySpec="&#x0E52;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E52;" />
             <!-- U+0E53: "๓" THAI DIGIT THREE -->
-            <Key
-                latin:keySpec="&#x0E53;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E53;" />
             <!-- U+0E54: "๔" THAI DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x0E54;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E54;" />
             <!-- U+0020: " " SPACE
                  U+0E39: " ู" THAI CHARACTER SARA UU -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E39;|&#x0E39;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
-            <Key
-                latin:keySpec="&#x0E3F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E3F;" />
             <!-- U+0E55: "๕" THAI DIGIT FIVE -->
-            <Key
-                latin:keySpec="&#x0E55;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E55;" />
             <!-- U+0E56: "๖" THAI DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x0E56;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E56;" />
             <!-- U+0E57: "๗" THAI DIGIT SEVEN -->
-            <Key
-                latin:keySpec="&#x0E57;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E57;" />
             <!-- U+0E58: "๘" THAI DIGIT EIGHT -->
-            <Key
-                latin:keySpec="&#x0E58;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E58;" />
             <!-- U+0E59: "๙" THAI DIGIT NINE -->
-            <Key
-                latin:keySpec="&#x0E59;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E59;" />
         </case>
         <default>
             <!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
-            <Key
-                latin:keySpec="&#x0E45;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E45;" />
             <!-- U+0E51: "๑" THAI DIGIT ONE -->
             <Key
+                latin:keySpec="/"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1"
                 latin:moreKeys="&#x0E51;"
-                latin:keySpec="/" />
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E52: "๒" THAI DIGIT TWO -->
             <Key
+                latin:keySpec="_"
                 latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2"
                 latin:moreKeys="&#x0E52;"
-                latin:keySpec="_" />
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO
                  U+0E53: "๓" THAI DIGIT THREE -->
             <Key
                 latin:keySpec="&#x0E20;"
                 latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x0E53;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E53;" />
             <!-- U+0E16: "ถ" THAI CHARACTER THO THUNG
                  U+0E54: "๔" THAI DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x0E16;"
                 latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x0E54;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E54;" />
             <!-- U+0020: " " SPACE
                  U+0E38: " ุ" THAI CHARACTER SARA U -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E38;|&#x0E38;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E36: " ึ" THAI CHARACTER SARA UE -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E36;|&#x0E36;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI
                  U+0E55: "๕" THAI DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x0E04;"
                 latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x0E55;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E55;" />
             <!-- U+0E15: "ต" THAI CHARACTER TO TAO
                  U+0E56: "๖" THAI DIGIT SIX -->
             <Key
                 latin:keySpec="&#x0E15;"
                 latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x0E56;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E56;" />
             <!-- U+0E08: "จ" THAI CHARACTER CHO CHAN
                  U+0E57: "๗" THAI DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x0E08;"
                 latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x0E57;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E57;" />
             <!-- U+0E02: "ข" THAI CHARACTER KHO KHAI
                  U+0E58: "๘" THAI DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x0E02;"
                 latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x0E58;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E58;" />
             <!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG
                  U+0E59: "๙" THAI DIGIT NINE -->
             <Key
                 latin:keySpec="&#x0E0A;"
                 latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x0E59;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E59;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml
index 7ab036a..f43d31f 100644
--- a/java/res/xml/rowkeys_thai2.xml
+++ b/java/res/xml/rowkeys_thai2.xml
@@ -18,63 +18,45 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0E50: "๐" THAI DIGIT ZERO -->
+            <Key latin:keySpec="&#x0E50;" />
             <Key
-                latin:keySpec="&#x0E50;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="&quot;" />
+                latin:keySpec="&quot;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->
-            <Key
-                latin:keySpec="&#x0E0E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E0E;" />
             <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->
-            <Key
-                latin:keySpec="&#x0E11;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E11;" />
             <!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->
-            <Key
-                latin:keySpec="&#x0E18;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E18;" />
             <!-- U+0020: " " SPACE
                  U+0E4D: " ํ" THAI CHARACTER THANTHAKHAT -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4D;|&#x0E4D;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E4A: " ๊" THAI CHARACTER MAI TRI -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4A;|&#x0E4A;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->
-            <Key
-                latin:keySpec="&#x0E13;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E13;" />
             <!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
-            <Key
-                latin:keySpec="&#x0E2F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2F;" />
             <!-- U+0E0D: "ญ" THAI CHARACTER YO YING -->
-            <Key
-                latin:keySpec="&#x0E0D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E0D;" />
             <!-- U+0E10: "ฐ" THAI CHARACTER THO THAN -->
+            <Key latin:keySpec="&#x0E10;" />
             <Key
-                latin:keySpec="&#x0E10;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="," />
+                latin:keySpec=","
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK
@@ -83,58 +65,39 @@
                 latin:keySpec="&#x0E46;"
                 latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0"
-                latin:moreKeys="&#x0E50;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E50;" />
             <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI -->
-            <Key
-                latin:keySpec="&#x0E44;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E44;" />
             <!-- U+0E33: "ำ" THAI CHARACTER SARA AM -->
-            <Key
-                latin:keySpec="&#x0E33;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E33;" />
             <!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
-            <Key
-                latin:keySpec="&#x0E1E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1E;" />
             <!-- U+0E30: "ะ" THAI CHARACTER SARA A -->
-            <Key
-                latin:keySpec="&#x0E30;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E30;" />
             <!-- U+0020: " " SPACE
                  U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E31;|&#x0E31;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E35: " ี" HAI CHARACTER SARA II -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E35;|&#x0E35;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E23: "ร" THAI CHARACTER RO RUA -->
-            <Key
-                latin:keySpec="&#x0E23;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E23;" />
             <!-- U+0E19: "น" THAI CHARACTER NO NU -->
-            <Key
-                latin:keySpec="&#x0E19;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E19;" />
             <!-- U+0E22: "ย" THAI CHARACTER YO YAK -->
-            <Key
-                latin:keySpec="&#x0E22;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E22;" />
             <!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->
-            <Key
-                latin:keySpec="&#x0E1A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1A;" />
             <!-- U+0E25: "ล" THAI CHARACTER LO LING -->
-            <Key
-                latin:keySpec="&#x0E25;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E25;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml
index 098d8a7..03959b9 100644
--- a/java/res/xml/rowkeys_thai3.xml
+++ b/java/res/xml/rowkeys_thai3.xml
@@ -18,113 +18,76 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0E24: "ฤ" THAI CHARACTER RU -->
-            <Key
-                latin:keySpec="&#x0E24;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E24;" />
             <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->
-            <Key
-                latin:keySpec="&#x0E06;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E06;" />
             <!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK -->
-            <Key
-                latin:keySpec="&#x0E0F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E0F;" />
             <!-- U+0E42: "โ" THAI CHARACTER SARA O -->
-            <Key
-                latin:keySpec="&#x0E42;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E42;" />
             <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
-            <Key
-                latin:keySpec="&#x0E0C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E0C;" />
             <!-- U+0020: " " SPACE
                  U+0E47: " ็" THAI CHARACTER MAITAIKHU -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E47;|&#x0E47;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4B;|&#x0E4B;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI -->
-            <Key
-                latin:keySpec="&#x0E29;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E29;" />
             <!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
-            <Key
-                latin:keySpec="&#x0E28;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E28;" />
             <!-- U+0E0B: "ซ" THAI CHARACTER SO SO -->
+            <Key latin:keySpec="&#x0E0B;" />
             <Key
-                latin:keySpec="&#x0E0B;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="." />
+                latin:keySpec="."
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN -->
-            <Key
-                latin:keySpec="&#x0E1F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1F;" />
             <!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->
-            <Key
-                latin:keySpec="&#x0E2B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2B;" />
             <!-- U+0E01: "ก" THAI CHARACTER KO KAI -->
-            <Key
-                latin:keySpec="&#x0E01;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E01;" />
             <!-- U+0E14: "ด" THAI CHARACTER DO DEK -->
-            <Key
-                latin:keySpec="&#x0E14;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E14;" />
             <!-- U+0E40: "เ" THAI CHARACTER SARA E -->
-            <Key
-                latin:keySpec="&#x0E40;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E40;" />
             <!-- U+0020: " " SPACE
                  U+0E49: " ้" THAI CHARACTER MAI THO -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E49;|&#x0E49;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E48: " ่" THAI CHARACTER MAI EK -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E48;|&#x0E48;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E32: "า" THAI CHARACTER SARA AA -->
-            <Key
-                latin:keySpec="&#x0E32;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E32;" />
             <!-- U+0E2A: "ส" THAI CHARACTER SO SUA -->
-            <Key
-                latin:keySpec="&#x0E2A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2A;" />
             <!-- U+0E27: "ว" THAI CHARACTER WO WAEN -->
-            <Key
-                latin:keySpec="&#x0E27;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E27;" />
             <!-- U+0E07: "ง" THAI CHARACTER NGO NGU -->
-            <Key
-                latin:keySpec="&#x0E07;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E07;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_thai4.xml b/java/res/xml/rowkeys_thai4.xml
index 332d09d..db665be 100644
--- a/java/res/xml/rowkeys_thai4.xml
+++ b/java/res/xml/rowkeys_thai4.xml
@@ -18,101 +18,74 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <Key
-                latin:keySpec="(" />
+                latin:keySpec="("
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec=")" />
+                latin:keySpec=")"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING -->
-            <Key
-                latin:keySpec="&#x0E09;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E09;" />
             <!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK -->
-            <Key
-                latin:keySpec="&#x0E2E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2E;" />
             <!-- U+0020: " " SPACE
                  U+0E3A: " ฺ" THAI CHARACTER PHINTHU -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E3A;|&#x0E3A;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E4C: " ์" THAI CHARACTER THANTHAKHAT -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4C;|&#x0E4C;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <Key
-                latin:keySpec="\?" />
+                latin:keySpec="\?"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO -->
-            <Key
-                latin:keySpec="&#x0E12;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E12;" />
             <!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA -->
-            <Key
-                latin:keySpec="&#x0E2C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2C;" />
             <!-- U+0E26: "ฦ" THAI CHARACTER LU -->
-            <Key
-                latin:keySpec="&#x0E26;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E26;" />
         </case>
         <default>
             <!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG -->
-            <Key
-                latin:keySpec="&#x0E1C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1C;" />
             <!-- U+0E1B: "ป" THAI CHARACTER PO PLA -->
-            <Key
-                latin:keySpec="&#x0E1B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1B;" />
             <!-- U+0E41: "แ" THAI CHARACTER SARA AE -->
-            <Key
-                latin:keySpec="&#x0E41;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E41;" />
             <!-- U+0E2D: "อ" THAI CHARACTER O ANG -->
-            <Key
-                latin:keySpec="&#x0E2D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2D;" />
             <!-- U+0020: " " SPACE
                  U+0E34: " ิ" THAI CHARACTER SARA I -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E34;|&#x0E34;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E37: " ื" THAI CHARACTER SARA UEE -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E37;|&#x0E37;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E17: "ท" THAI CHARACTER THO THAHAN -->
-            <Key
-                latin:keySpec="&#x0E17;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E17;" />
             <!-- U+0E21: "ม" THAI CHARACTER MO MA -->
-            <Key
-                latin:keySpec="&#x0E21;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E21;" />
             <!-- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN -->
-            <Key
-                latin:keySpec="&#x0E43;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E43;" />
             <!-- U+0E1D: "ฝ" THAI CHARACTER FO FA -->
-            <Key
-                latin:keySpec="&#x0E1D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1D;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml
index 798c23e..3f765f3 100644
--- a/java/res/xml/rows_arabic.xml
+++ b/java/res/xml/rows_arabic.xml
@@ -18,32 +18,28 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic1" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic2" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic2" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic3" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_armenian_phonetic.xml b/java/res/xml/rows_armenian_phonetic.xml
index ea8870e..198436c 100644
--- a/java/res/xml/rows_armenian_phonetic.xml
+++ b/java/res/xml/rows_armenian_phonetic.xml
@@ -18,47 +18,40 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_currency" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/key_styles_currency" />
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
     </Row>
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
     </Row>
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
-        <include
-            latin:keyboardLayout="@xml/key_armenian_xeh" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
+        <include latin:keyboardLayout="@xml/key_armenian_xeh" />
     </Row>
     <Row
         latin:keyWidth="9.8000%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
-        <include
-            latin:keyboardLayout="@xml/key_armenian_sha" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
+        <include latin:keyboardLayout="@xml/key_armenian_sha" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_bengali.xml b/java/res/xml/rows_bengali.xml
index 890f935..4e4223b 100644
--- a/java/res/xml/rows_bengali.xml
+++ b/java/res/xml/rows_bengali.xml
@@ -18,32 +18,28 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali1" />
-    </Row>
-    <Row
-            latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali2" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali3" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali2" />
+    </Row>
+    <Row
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
+    >
+        <include latin:keyboardLayout="@xml/rowkeys_bengali3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_farsi.xml b/java/res/xml/rows_farsi.xml
index c74614f..b78048c 100644
--- a/java/res/xml/rows_farsi.xml
+++ b/java/res/xml/rows_farsi.xml
@@ -18,32 +18,28 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_farsi1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_farsi2" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi3" />
+        <include latin:keyboardLayout="@xml/rowkeys_farsi3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_hindi.xml b/java/res/xml/rows_hindi.xml
index 5c631eb..da869b1 100644
--- a/java/res/xml/rows_hindi.xml
+++ b/java/res/xml/rows_hindi.xml
@@ -18,35 +18,31 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi2" />
     </Row>
     <Row
         latin:keyWidth="8.711%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi3" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_hindi_compact.xml b/java/res/xml/rows_hindi_compact.xml
index a60cf2b..d21fada 100644
--- a/java/res/xml/rows_hindi_compact.xml
+++ b/java/res/xml/rows_hindi_compact.xml
@@ -18,32 +18,28 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
-    </Row>
-    <Row
-            latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
+    </Row>
+    <Row
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
+    >
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_khmer.xml b/java/res/xml/rows_khmer.xml
index e399387..69334f3 100644
--- a/java/res/xml/rows_khmer.xml
+++ b/java/res/xml/rows_khmer.xml
@@ -18,39 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer1" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer1" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer2" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer2" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer3" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer3" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <Key
-            latin:keyStyle="shiftKeyStyle" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer4" />
-        <Key
-            latin:keyStyle="deleteKeyStyle" />
+        <Key latin:keyStyle="shiftKeyStyle" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer4" />
+        <Key latin:keyStyle="deleteKeyStyle" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_lao.xml b/java/res/xml/rows_lao.xml
index 321f411..b3fbf56 100644
--- a/java/res/xml/rows_lao.xml
+++ b/java/res/xml/rows_lao.xml
@@ -18,39 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao1" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao1" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao2" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao2" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao3" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao3" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <Key
-            latin:keyStyle="shiftKeyStyle" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao4" />
-        <Key
-            latin:keyStyle="deleteKeyStyle" />
+        <Key latin:keyStyle="shiftKeyStyle" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao4" />
+        <Key latin:keyStyle="deleteKeyStyle" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_marathi.xml b/java/res/xml/rows_marathi.xml
index 42a0363..ff11adb 100644
--- a/java/res/xml/rows_marathi.xml
+++ b/java/res/xml/rows_marathi.xml
@@ -18,32 +18,28 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi1" />
-    </Row>
-    <Row
-            latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi3" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi2" />
+    </Row>
+    <Row
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
+    >
+        <include latin:keyboardLayout="@xml/rowkeys_marathi3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_myanmar.xml b/java/res/xml/rows_myanmar.xml
index 5de47f7..54538a9 100644
--- a/java/res/xml/rows_myanmar.xml
+++ b/java/res/xml/rows_myanmar.xml
@@ -18,39 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar1" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar1" />
     </Row>
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar2" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar2" />
     </Row>
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar3" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar3" />
     </Row>
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <Key
-            latin:keyStyle="shiftKeyStyle" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar4" />
-        <Key
-            latin:keyStyle="deleteKeyStyle" />
+        <Key latin:keyStyle="shiftKeyStyle" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar4" />
+        <Key latin:keyStyle="deleteKeyStyle" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_nepali_romanized.xml b/java/res/xml/rows_nepali_romanized.xml
index 6df09c8..daca3ee 100644
--- a/java/res/xml/rows_nepali_romanized.xml
+++ b/java/res/xml/rows_nepali_romanized.xml
@@ -18,35 +18,31 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
     </Row>
     <Row
         latin:keyWidth="8.711%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_nepali_traditional.xml b/java/res/xml/rows_nepali_traditional.xml
index 7789135..edcc73a 100644
--- a/java/res/xml/rows_nepali_traditional.xml
+++ b/java/res/xml/rows_nepali_traditional.xml
@@ -18,39 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_currency" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/key_styles_currency" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
     </Row>
     <Row
         latin:keyWidth="8.711%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right3" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_sinhala.xml b/java/res/xml/rows_sinhala.xml
index b47b373..a2ba0bb 100644
--- a/java/res/xml/rows_sinhala.xml
+++ b/java/res/xml/rows_sinhala.xml
@@ -18,35 +18,31 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala1" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala2" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala2" />
     </Row>
     <Row
         latin:keyWidth="8.711%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala3" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_thai.xml b/java/res/xml/rows_thai.xml
index 108b7e1..fffdb44 100644
--- a/java/res/xml/rows_thai.xml
+++ b/java/res/xml/rows_thai.xml
@@ -18,41 +18,34 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai1" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai1" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai2" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai2" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai3" />
-        <include
-            latin:keyboardLayout="@xml/key_thai_kho_khuat" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai3" />
+        <include latin:keyboardLayout="@xml/key_thai_kho_khuat" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <Key
-            latin:keyStyle="shiftKeyStyle" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai4" />
-        <Key
-            latin:keyStyle="deleteKeyStyle" />
+        <Key latin:keyStyle="shiftKeyStyle" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai4" />
+        <Key latin:keyStyle="deleteKeyStyle" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/src/com/android/inputmethod/compat/LocaleSpanCompatUtils.java b/java/src/com/android/inputmethod/compat/LocaleSpanCompatUtils.java
index 9676458..f411f18 100644
--- a/java/src/com/android/inputmethod/compat/LocaleSpanCompatUtils.java
+++ b/java/src/com/android/inputmethod/compat/LocaleSpanCompatUtils.java
@@ -16,30 +16,37 @@
 
 package com.android.inputmethod.compat;
 
+import android.text.Spannable;
+import android.text.style.LocaleSpan;
+import android.util.Log;
+
 import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.compat.CompatUtils;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Locale;
 
 @UsedForTesting
 public final class LocaleSpanCompatUtils {
+    private static final String TAG = LocaleSpanCompatUtils.class.getSimpleName();
+
     // Note that LocaleSpan(Locale locale) has been introduced in API level 17
     // (Build.VERSION_CODE.JELLY_BEAN_MR1).
-    private static Class<?> getLocalSpanClass() {
+    private static Class<?> getLocaleSpanClass() {
         try {
             return Class.forName("android.text.style.LocaleSpan");
         } catch (ClassNotFoundException e) {
             return null;
         }
     }
+    private static final Class<?> LOCALE_SPAN_TYPE;
     private static final Constructor<?> LOCALE_SPAN_CONSTRUCTOR;
     private static final Method LOCALE_SPAN_GET_LOCALE;
     static {
-        final Class<?> localeSpanClass = getLocalSpanClass();
-        LOCALE_SPAN_CONSTRUCTOR = CompatUtils.getConstructor(localeSpanClass, Locale.class);
-        LOCALE_SPAN_GET_LOCALE = CompatUtils.getMethod(localeSpanClass, "getLocale");
+        LOCALE_SPAN_TYPE = getLocaleSpanClass();
+        LOCALE_SPAN_CONSTRUCTOR = CompatUtils.getConstructor(LOCALE_SPAN_TYPE, Locale.class);
+        LOCALE_SPAN_GET_LOCALE = CompatUtils.getMethod(LOCALE_SPAN_TYPE, "getLocale");
     }
 
     @UsedForTesting
@@ -56,4 +63,162 @@
     public static Locale getLocaleFromLocaleSpan(final Object localeSpan) {
         return (Locale) CompatUtils.invoke(localeSpan, null, LOCALE_SPAN_GET_LOCALE);
     }
+
+    /**
+     * Ensures that the specified range is covered with only one {@link LocaleSpan} with the given
+     * locale. If the region is already covered by one or more {@link LocaleSpan}, their ranges are
+     * updated so that each character has only one locale.
+     * @param spannable the spannable object to be updated.
+     * @param start the start index from which {@link LocaleSpan} is attached (inclusive).
+     * @param end the end index to which {@link LocaleSpan} is attached (exclusive).
+     * @param locale the locale to be attached to the specified range.
+     */
+    @UsedForTesting
+    public static void updateLocaleSpan(final Spannable spannable, final int start,
+            final int end, final Locale locale) {
+        if (end < start) {
+            Log.e(TAG, "Invalid range: start=" + start + " end=" + end);
+            return;
+        }
+        if (!isLocaleSpanAvailable()) {
+            return;
+        }
+        // A brief summary of our strategy;
+        //   1. Enumerate all LocaleSpans between [start - 1, end + 1].
+        //   2. For each LocaleSpan S:
+        //      - Update the range of S so as not to cover [start, end] if S doesn't have the
+        //        expected locale.
+        //      - Mark S as "to be merged" if S has the expected locale.
+        //   3. Merge all the LocaleSpans that are marked as "to be merged" into one LocaleSpan.
+        //      If no appropriate span is found, create a new one with newLocaleSpan method.
+        final int searchStart = Math.max(start - 1, 0);
+        final int searchEnd = Math.min(end + 1, spannable.length());
+        // LocaleSpans found in the target range. See the step 1 in the above comment.
+        final Object[] existingLocaleSpans = spannable.getSpans(searchStart, searchEnd,
+                LOCALE_SPAN_TYPE);
+        // LocaleSpans that are marked as "to be merged". See the step 2 in the above comment.
+        final ArrayList<Object> existingLocaleSpansToBeMerged = new ArrayList<>();
+        boolean isStartExclusive = true;
+        boolean isEndExclusive = true;
+        int newStart = start;
+        int newEnd = end;
+        for (final Object existingLocaleSpan : existingLocaleSpans) {
+            final Locale attachedLocale = getLocaleFromLocaleSpan(existingLocaleSpan);
+            if (!locale.equals(attachedLocale)) {
+                // This LocaleSpan does not have the expected locale. Update its range if it has
+                // an intersection with the range [start, end] (the first case of the step 2 in the
+                // above comment).
+                removeLocaleSpanFromRange(existingLocaleSpan, spannable, start, end);
+                continue;
+            }
+            final int spanStart = spannable.getSpanStart(existingLocaleSpan);
+            final int spanEnd = spannable.getSpanEnd(existingLocaleSpan);
+            if (spanEnd < spanStart) {
+                Log.e(TAG, "Invalid span: spanStart=" + spanStart + " spanEnd=" + spanEnd);
+                continue;
+            }
+            if (spanEnd < start || end < spanStart) {
+                // No intersection found.
+                continue;
+            }
+
+            // Here existingLocaleSpan has the expected locale and an intersection with the
+            // range [start, end] (the second case of the the step 2 in the above comment).
+            final int spanFlag = spannable.getSpanFlags(existingLocaleSpan);
+            if (spanStart < newStart) {
+                newStart = spanStart;
+                isStartExclusive = ((spanFlag & Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) ==
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+            if (newEnd < spanEnd) {
+                newEnd = spanEnd;
+                isEndExclusive = ((spanFlag & Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) ==
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+            existingLocaleSpansToBeMerged.add(existingLocaleSpan);
+        }
+
+        int originalLocaleSpanFlag = 0;
+        Object localeSpan = null;
+        if (existingLocaleSpansToBeMerged.isEmpty()) {
+            // If there is no LocaleSpan that is marked as to be merged, create a new one.
+            localeSpan = newLocaleSpan(locale);
+        } else {
+            // Reuse the first LocaleSpan to avoid unnecessary object instantiation.
+            localeSpan = existingLocaleSpansToBeMerged.get(0);
+            originalLocaleSpanFlag = spannable.getSpanFlags(localeSpan);
+            // No need to keep other instances.
+            for (int i = 1; i < existingLocaleSpansToBeMerged.size(); ++i) {
+                spannable.removeSpan(existingLocaleSpansToBeMerged.get(i));
+            }
+        }
+        final int localeSpanFlag = getSpanFlag(originalLocaleSpanFlag, isStartExclusive,
+                isEndExclusive);
+        spannable.setSpan(localeSpan, newStart, newEnd, localeSpanFlag);
+    }
+
+    private static void removeLocaleSpanFromRange(final Object localeSpan,
+            final Spannable spannable, final int removeStart, final int removeEnd) {
+        if (!isLocaleSpanAvailable()) {
+            return;
+        }
+        final int spanStart = spannable.getSpanStart(localeSpan);
+        final int spanEnd = spannable.getSpanEnd(localeSpan);
+        if (spanStart > spanEnd) {
+            Log.e(TAG, "Invalid span: spanStart=" + spanStart + " spanEnd=" + spanEnd);
+            return;
+        }
+        if (spanEnd < removeStart) {
+            // spanStart < spanEnd < removeStart < removeEnd
+            return;
+        }
+        if (removeEnd < spanStart) {
+            // spanStart < removeEnd < spanStart < spanEnd
+            return;
+        }
+        final int spanFlags = spannable.getSpanFlags(localeSpan);
+        if (spanStart < removeStart) {
+            if (removeEnd < spanEnd) {
+                // spanStart < removeStart < removeEnd < spanEnd
+                final Locale locale = getLocaleFromLocaleSpan(localeSpan);
+                spannable.setSpan(localeSpan, spanStart, removeStart, spanFlags);
+                final Object attionalLocaleSpan = newLocaleSpan(locale);
+                spannable.setSpan(attionalLocaleSpan, removeEnd, spanEnd, spanFlags);
+                return;
+            }
+            // spanStart < removeStart < spanEnd <= removeEnd
+            spannable.setSpan(localeSpan, spanStart, removeStart, spanFlags);
+            return;
+        }
+        if (removeEnd < spanEnd) {
+            // removeStart <= spanStart < removeEnd < spanEnd
+            spannable.setSpan(localeSpan, removeEnd, spanEnd, spanFlags);
+            return;
+        }
+        // removeStart <= spanStart < spanEnd < removeEnd
+        spannable.removeSpan(localeSpan);
+    }
+
+    private static int getSpanFlag(final int originalFlag,
+            final boolean isStartExclusive, final boolean isEndExclusive) {
+        return (originalFlag & ~Spannable.SPAN_POINT_MARK_MASK) |
+                getSpanPointMarkFlag(isStartExclusive, isEndExclusive);
+    }
+
+    private static int getSpanPointMarkFlag(final boolean isStartExclusive,
+            final boolean isEndExclusive) {
+        if (isStartExclusive) {
+            if (isEndExclusive) {
+                return Spannable.SPAN_EXCLUSIVE_EXCLUSIVE;
+            } else {
+                return Spannable.SPAN_EXCLUSIVE_INCLUSIVE;
+            }
+        } else {
+            if (isEndExclusive) {
+                return Spannable.SPAN_INCLUSIVE_EXCLUSIVE;
+            } else {
+                return Spannable.SPAN_INCLUSIVE_INCLUSIVE;
+            }
+        }
+    }
 }
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index 88cde11..ed3b2b3 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -62,8 +62,11 @@
     private static final int LABEL_FLAGS_ALIGN_RIGHT = 0x02;
     private static final int LABEL_FLAGS_ALIGN_BUTTOM = 0x04;
     private static final int LABEL_FLAGS_ALIGN_LEFT_OF_CENTER = 0x08;
+    // Font typeface specification.
+    private static final int LABEL_FLAGS_FONT_MASK = 0x30;
     private static final int LABEL_FLAGS_FONT_NORMAL = 0x10;
     private static final int LABEL_FLAGS_FONT_MONO_SPACE = 0x20;
+    private static final int LABEL_FLAGS_FONT_DEFAULT = 0x30;
     // Start of key text ratio enum values
     private static final int LABEL_FLAGS_FOLLOW_KEY_TEXT_RATIO_MASK = 0x1C0;
     private static final int LABEL_FLAGS_FOLLOW_KEY_LARGE_LETTER_RATIO = 0x40;
@@ -567,14 +570,16 @@
     }
 
     public final Typeface selectTypeface(final KeyDrawParams params) {
-        // TODO: Handle "bold" here too?
-        if ((mLabelFlags & LABEL_FLAGS_FONT_NORMAL) != 0) {
+        switch (mLabelFlags & LABEL_FLAGS_FONT_MASK) {
+        case LABEL_FLAGS_FONT_NORMAL:
             return Typeface.DEFAULT;
-        }
-        if ((mLabelFlags & LABEL_FLAGS_FONT_MONO_SPACE) != 0) {
+        case LABEL_FLAGS_FONT_MONO_SPACE:
             return Typeface.MONOSPACE;
+        case LABEL_FLAGS_FONT_DEFAULT:
+        default:
+            // The type-face is specified by keyTypeface attribute.
+            return params.mTypeface;
         }
-        return params.mTypeface;
     }
 
     public final int selectTextSize(final KeyDrawParams params) {
diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
index fdd47a4..a6b3b71 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -26,17 +26,16 @@
 import android.view.inputmethod.ExtractedTextRequest;
 import android.view.inputmethod.InputConnection;
 
-import com.android.inputmethod.latin.PrevWordsInfo.WordInfo;
 import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
 import com.android.inputmethod.latin.utils.CapsModeUtils;
 import com.android.inputmethod.latin.utils.DebugLogUtils;
+import com.android.inputmethod.latin.utils.PrevWordsInfoUtils;
 import com.android.inputmethod.latin.utils.ScriptUtils;
 import com.android.inputmethod.latin.utils.SpannableStringUtils;
 import com.android.inputmethod.latin.utils.StringUtils;
 import com.android.inputmethod.latin.utils.TextRange;
 
 import java.util.Arrays;
-import java.util.regex.Pattern;
 
 /**
  * Enrichment class for InputConnection to simplify interaction and add functionality.
@@ -55,7 +54,6 @@
     private static final int LOOKBACK_CHARACTER_NUM = Constants.DICTIONARY_MAX_WORD_LENGTH
             * (Constants.MAX_PREV_WORD_COUNT_FOR_N_GRAM + 1) /* words */
             + Constants.MAX_PREV_WORD_COUNT_FOR_N_GRAM /* separators */;
-    private static final Pattern spaceRegex = Pattern.compile("\\s+");
     private static final int INVALID_CURSOR_POSITION = -1;
 
     /**
@@ -541,85 +539,14 @@
                 }
             }
         }
-        return getPrevWordsInfoFromNthPreviousWord(prev, spacingAndPunctuations, n);
+        return PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
+                prev, spacingAndPunctuations, n);
     }
 
     private static boolean isSeparator(final int code, final int[] sortedSeparators) {
         return Arrays.binarySearch(sortedSeparators, code) >= 0;
     }
 
-    // Get context information from nth word before the cursor. n = 1 retrieves the words
-    // immediately before the cursor, n = 2 retrieves the words before that, and so on. This splits
-    // on whitespace only.
-    // Also, it won't return words that end in a separator (if the nth word before the cursor
-    // ends in a separator, it returns information representing beginning-of-sentence).
-    // Example (when Constants.MAX_PREV_WORD_COUNT_FOR_N_GRAM is 2):
-    // (n = 1) "abc def|" -> abc, def
-    // (n = 1) "abc def |" -> abc, def
-    // (n = 1) "abc 'def|" -> empty, 'def
-    // (n = 1) "abc def. |" -> beginning-of-sentence
-    // (n = 1) "abc def . |" -> beginning-of-sentence
-    // (n = 2) "abc def|" -> beginning-of-sentence, abc
-    // (n = 2) "abc def |" -> beginning-of-sentence, abc
-    // (n = 2) "abc 'def|" -> empty. The context is different from "abc def", but we cannot
-    // represent this situation using PrevWordsInfo. See TODO in the method.
-    // TODO: The next example's result should be "abc, def". This have to be fixed before we
-    // retrieve the prior context of Beginning-of-Sentence.
-    // (n = 2) "abc def. |" -> beginning-of-sentence, abc
-    // (n = 2) "abc def . |" -> abc, def
-    // (n = 2) "abc|" -> beginning-of-sentence
-    // (n = 2) "abc |" -> beginning-of-sentence
-    // (n = 2) "abc. def|" -> beginning-of-sentence
-    public static PrevWordsInfo getPrevWordsInfoFromNthPreviousWord(final CharSequence prev,
-            final SpacingAndPunctuations spacingAndPunctuations, final int n) {
-        if (prev == null) return PrevWordsInfo.EMPTY_PREV_WORDS_INFO;
-        final String[] w = spaceRegex.split(prev);
-        final WordInfo[] prevWordsInfo = new WordInfo[Constants.MAX_PREV_WORD_COUNT_FOR_N_GRAM];
-        for (int i = 0; i < prevWordsInfo.length; i++) {
-            final int focusedWordIndex = w.length - n - i;
-            // Referring to the word after the focused word.
-            if ((focusedWordIndex + 1) >= 0 && (focusedWordIndex + 1) < w.length) {
-                final String wordFollowingTheNthPrevWord = w[focusedWordIndex + 1];
-                if (!wordFollowingTheNthPrevWord.isEmpty()) {
-                    final char firstChar = wordFollowingTheNthPrevWord.charAt(0);
-                    if (spacingAndPunctuations.isWordConnector(firstChar)) {
-                        // The word following the focused word is starting with a word connector.
-                        // TODO: Return meaningful context for this case.
-                        prevWordsInfo[i] = WordInfo.EMPTY_WORD_INFO;
-                        break;
-                    }
-                }
-            }
-            // If we can't find (n + i) words, the context is beginning-of-sentence.
-            if (focusedWordIndex < 0) {
-                prevWordsInfo[i] = WordInfo.BEGINNING_OF_SENTENCE;
-                break;
-            }
-            final String focusedWord = w[focusedWordIndex];
-            // If the word is empty, the context is beginning-of-sentence.
-            final int length = focusedWord.length();
-            if (length <= 0) {
-                prevWordsInfo[i] = WordInfo.BEGINNING_OF_SENTENCE;
-                break;
-            }
-            // If ends in a sentence separator, the context is beginning-of-sentence.
-            final char lastChar = focusedWord.charAt(length - 1);
-            if (spacingAndPunctuations.isSentenceSeparator(lastChar)) {
-                prevWordsInfo[i] = WordInfo.BEGINNING_OF_SENTENCE;
-                break;
-            }
-            // If ends in a word separator or connector, the context is unclear.
-            // TODO: Return meaningful context for this case.
-            if (spacingAndPunctuations.isWordSeparator(lastChar)
-                    || spacingAndPunctuations.isWordConnector(lastChar)) {
-                prevWordsInfo[i] = WordInfo.EMPTY_WORD_INFO;
-                break;
-            }
-            prevWordsInfo[i] = new WordInfo(focusedWord);
-        }
-        return new PrevWordsInfo(prevWordsInfo);
-    }
-
     /**
      * Returns the text surrounding the cursor.
      *
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
index 7758ac7..7cf4eff 100644
--- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
+++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
@@ -64,8 +64,7 @@
     }
 
     public static void init(final Context context) {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        sInstance.initInternal(context, prefs);
+        sInstance.initInternal(context);
     }
 
     private boolean isInitialized() {
@@ -78,7 +77,7 @@
         }
     }
 
-    private void initInternal(final Context context, final SharedPreferences prefs) {
+    private void initInternal(final Context context) {
         if (isInitialized()) {
             return;
         }
@@ -88,11 +87,16 @@
 
         // Initialize additional subtypes.
         SubtypeLocaleUtils.init(context);
+        final InputMethodSubtype[] additionalSubtypes = getAdditionalSubtypes(context);
+        setAdditionalInputMethodSubtypes(additionalSubtypes);
+    }
+
+    public InputMethodSubtype[] getAdditionalSubtypes(final Context context) {
+        SubtypeLocaleUtils.init(context);
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         final String prefAdditionalSubtypes = Settings.readPrefAdditionalSubtypes(
                 prefs, context.getResources());
-        final InputMethodSubtype[] additionalSubtypes =
-                AdditionalSubtypeUtils.createAdditionalSubtypesArray(prefAdditionalSubtypes);
-        setAdditionalInputMethodSubtypes(additionalSubtypes);
+        return AdditionalSubtypeUtils.createAdditionalSubtypesArray(prefAdditionalSubtypes);
     }
 
     public InputMethodManager getInputMethodManager() {
diff --git a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java b/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
new file mode 100644
index 0000000..e4ee426
--- /dev/null
+++ b/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.latin;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.os.Process;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
+
+import com.android.inputmethod.compat.IntentCompatUtils;
+import com.android.inputmethod.latin.settings.Settings;
+import com.android.inputmethod.latin.setup.LauncherIconVisibilityManager;
+import com.android.inputmethod.latin.setup.SetupActivity;
+import com.android.inputmethod.latin.utils.UncachedInputMethodManagerUtils;
+
+/**
+ * This class detects the {@link Intent#ACTION_MY_PACKAGE_REPLACED} broadcast intent when this IME
+ * package has been replaced by a newer version of the same package. This class also detects
+ * {@link Intent#ACTION_BOOT_COMPLETED} and {@link Intent#ACTION_USER_INITIALIZE} broadcast intent.
+ *
+ * If this IME has already been installed in the system image and a new version of this IME has
+ * been installed, {@link Intent#ACTION_MY_PACKAGE_REPLACED} is received by this receiver and it
+ * will hide the setup wizard's icon.
+ *
+ * If this IME has already been installed in the data partition and a new version of this IME has
+ * been installed, {@link Intent#ACTION_MY_PACKAGE_REPLACED} is received by this receiver but it
+ * will not hide the setup wizard's icon, and the icon will appear on the launcher.
+ *
+ * If this IME hasn't been installed yet and has been newly installed, no
+ * {@link Intent#ACTION_MY_PACKAGE_REPLACED} will be sent and the setup wizard's icon will appear
+ * on the launcher.
+ *
+ * When the device has been booted, {@link Intent#ACTION_BOOT_COMPLETED} is received by this
+ * receiver and it checks whether the setup wizard's icon should be appeared or not on the launcher
+ * depending on which partition this IME is installed.
+ *
+ * When a multiuser account has been created, {@link Intent#ACTION_USER_INITIALIZE} is received
+ * by this receiver and it checks the whether the setup wizard's icon should be appeared or not on
+ * the launcher depending on which partition this IME is installed.
+ */
+public final class SystemBroadcastReceiver extends BroadcastReceiver {
+    private static final String TAG = SystemBroadcastReceiver.class.getSimpleName();
+
+    @Override
+    public void onReceive(final Context context, final Intent intent) {
+        final String intentAction = intent.getAction();
+        if (Intent.ACTION_MY_PACKAGE_REPLACED.equals(intentAction)) {
+            Log.i(TAG, "Package has been replaced: " + context.getPackageName());
+        } else if (Intent.ACTION_BOOT_COMPLETED.equals(intentAction)) {
+            Log.i(TAG, "Boot has been completed");
+        } else if (IntentCompatUtils.is_ACTION_USER_INITIALIZE(intentAction)) {
+            Log.i(TAG, "User initialize");
+        }
+
+        LauncherIconVisibilityManager.onReceiveGlobalIntent(intentAction, context);
+
+        if (Intent.ACTION_MY_PACKAGE_REPLACED.equals(intentAction)) {
+            // Need to restore additional subtypes because system always clears additional
+            // subtypes when the package is replaced.
+            RichInputMethodManager.init(context);
+            final RichInputMethodManager richImm = RichInputMethodManager.getInstance();
+            final InputMethodSubtype[] additionalSubtypes = richImm.getAdditionalSubtypes(context);
+            richImm.setAdditionalInputMethodSubtypes(additionalSubtypes);
+        }
+
+        // The process that hosts this broadcast receiver is invoked and remains alive even after
+        // 1) the package has been re-installed, 2) the device has just booted,
+        // 3) a new user has been created.
+        // There is no good reason to keep the process alive if this IME isn't a current IME.
+        final InputMethodManager imm =
+                (InputMethodManager)context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        // Called to check whether this IME has been triggered by the current user or not
+        final boolean isInputMethodManagerValidForUserOfThisProcess =
+                !imm.getInputMethodList().isEmpty();
+        final boolean isCurrentImeOfCurrentUser = isInputMethodManagerValidForUserOfThisProcess
+                && UncachedInputMethodManagerUtils.isThisImeCurrent(context, imm);
+        if (!isCurrentImeOfCurrentUser) {
+            final int myPid = Process.myPid();
+            Log.i(TAG, "Killing my process: pid=" + myPid);
+            Process.killProcess(myPid);
+        }
+    }
+}
diff --git a/java/src/com/android/inputmethod/latin/setup/LauncherIconVisibilityManager.java b/java/src/com/android/inputmethod/latin/setup/LauncherIconVisibilityManager.java
index 050d8d2..9585736 100644
--- a/java/src/com/android/inputmethod/latin/setup/LauncherIconVisibilityManager.java
+++ b/java/src/com/android/inputmethod/latin/setup/LauncherIconVisibilityManager.java
@@ -16,85 +16,51 @@
 
 package com.android.inputmethod.latin.setup;
 
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.os.Process;
 import android.preference.PreferenceManager;
 import android.util.Log;
-import android.view.inputmethod.InputMethodManager;
 
 import com.android.inputmethod.compat.IntentCompatUtils;
 import com.android.inputmethod.latin.settings.Settings;
 
 /**
- * This class detects the {@link Intent#ACTION_MY_PACKAGE_REPLACED} broadcast intent when this IME
- * package has been replaced by a newer version of the same package. This class also detects
+ * This class handles the {@link Intent#ACTION_MY_PACKAGE_REPLACED} broadcast intent when this IME
+ * package has been replaced by a newer version of the same package. This class also handles
  * {@link Intent#ACTION_BOOT_COMPLETED} and {@link Intent#ACTION_USER_INITIALIZE} broadcast intent.
  *
  * If this IME has already been installed in the system image and a new version of this IME has
- * been installed, {@link Intent#ACTION_MY_PACKAGE_REPLACED} is received by this receiver and it
- * will hide the setup wizard's icon.
+ * been installed, {@link Intent#ACTION_MY_PACKAGE_REPLACED} is received to this class to hide the
+ * setup wizard's icon.
  *
  * If this IME has already been installed in the data partition and a new version of this IME has
- * been installed, {@link Intent#ACTION_MY_PACKAGE_REPLACED} is received by this receiver but it
+ * been installed, {@link Intent#ACTION_MY_PACKAGE_REPLACED} is forwarded to this class but it
  * will not hide the setup wizard's icon, and the icon will appear on the launcher.
  *
  * If this IME hasn't been installed yet and has been newly installed, no
  * {@link Intent#ACTION_MY_PACKAGE_REPLACED} will be sent and the setup wizard's icon will appear
  * on the launcher.
  *
- * When the device has been booted, {@link Intent#ACTION_BOOT_COMPLETED} is received by this
- * receiver and it checks whether the setup wizard's icon should be appeared or not on the launcher
+ * When the device has been booted, {@link Intent#ACTION_BOOT_COMPLETED} is forwarded to this class
+ * to check whether the setup wizard's icon should be appeared or not on the launcher
  * depending on which partition this IME is installed.
  *
- * When a multiuser account has been created, {@link Intent#ACTION_USER_INITIALIZE} is received
- * by this receiver and it checks the whether the setup wizard's icon should be appeared or not on
- * the launcher depending on which partition this IME is installed.
+ * When a multiuser account has been created, {@link Intent#ACTION_USER_INITIALIZE} is forwarded to
+ * this class to check whether the setup wizard's icon should be appeared or not on the launcher
+ * depending on which partition this IME is installed.
  */
-public final class LauncherIconVisibilityManager extends BroadcastReceiver {
+public final class LauncherIconVisibilityManager {
     private static final String TAG = LauncherIconVisibilityManager.class.getSimpleName();
 
-    @Override
-    public void onReceive(final Context context, final Intent intent) {
-        if (shouldHandleThisIntent(intent, context)) {
+    public static void onReceiveGlobalIntent(final String action, final Context context) {
+        if (Intent.ACTION_MY_PACKAGE_REPLACED.equals(action) ||
+                Intent.ACTION_BOOT_COMPLETED.equals(action) ||
+                IntentCompatUtils.is_ACTION_USER_INITIALIZE(action)) {
             updateSetupWizardIconVisibility(context);
         }
-
-        // The process that hosts this broadcast receiver is invoked and remains alive even after
-        // 1) the package has been re-installed, 2) the device has just booted,
-        // 3) a new user has been created.
-        // There is no good reason to keep the process alive if this IME isn't a current IME.
-        final InputMethodManager imm =
-                (InputMethodManager)context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        // Called to check whether this IME has been triggered by the current user or not
-        final boolean isInputMethodManagerValidForUserOfThisProcess =
-                !imm.getInputMethodList().isEmpty();
-        final boolean isCurrentImeOfCurrentUser = isInputMethodManagerValidForUserOfThisProcess
-                && SetupActivity.isThisImeCurrent(context, imm);
-        if (!isCurrentImeOfCurrentUser) {
-            final int myPid = Process.myPid();
-            Log.i(TAG, "Killing my process: pid=" + myPid);
-            Process.killProcess(myPid);
-        }
-    }
-
-    private static boolean shouldHandleThisIntent(final Intent intent, final Context context) {
-        final String action = intent.getAction();
-        if (Intent.ACTION_MY_PACKAGE_REPLACED.equals(action)) {
-            Log.i(TAG, "Package has been replaced: " + context.getPackageName());
-            return true;
-        } else if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
-            Log.i(TAG, "Boot has been completed");
-            return true;
-        } else if (IntentCompatUtils.is_ACTION_USER_INITIALIZE(action)) {
-            Log.i(TAG, "User initialize");
-            return true;
-        }
-        return false;
     }
 
     public static void updateSetupWizardIconVisibility(final Context context) {
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
index a68f98f..b770ea5 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
+++ b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
@@ -37,65 +37,4 @@
             finish();
         }
     }
-
-    /*
-     * We may not be able to get our own {@link InputMethodInfo} just after this IME is installed
-     * because {@link InputMethodManagerService} may not be aware of this IME yet.
-     * Note: {@link RichInputMethodManager} has similar methods. Here in setup wizard, we can't
-     * use it for the reason above.
-     */
-
-    /**
-     * Check if the IME specified by the context is enabled.
-     * CAVEAT: This may cause a round trip IPC.
-     *
-     * @param context package context of the IME to be checked.
-     * @param imm the {@link InputMethodManager}.
-     * @return true if this IME is enabled.
-     */
-    /* package */ static boolean isThisImeEnabled(final Context context,
-            final InputMethodManager imm) {
-        final String packageName = context.getPackageName();
-        for (final InputMethodInfo imi : imm.getEnabledInputMethodList()) {
-            if (packageName.equals(imi.getPackageName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if the IME specified by the context is the current IME.
-     * CAVEAT: This may cause a round trip IPC.
-     *
-     * @param context package context of the IME to be checked.
-     * @param imm the {@link InputMethodManager}.
-     * @return true if this IME is the current IME.
-     */
-    /* package */ static boolean isThisImeCurrent(final Context context,
-            final InputMethodManager imm) {
-        final InputMethodInfo imi = getInputMethodInfoOf(context.getPackageName(), imm);
-        final String currentImeId = Settings.Secure.getString(
-                context.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
-        return imi != null && imi.getId().equals(currentImeId);
-    }
-
-    /**
-     * Get {@link InputMethodInfo} of the IME specified by the package name.
-     * CAVEAT: This may cause a round trip IPC.
-     *
-     * @param packageName package name of the IME.
-     * @param imm the {@link InputMethodManager}.
-     * @return the {@link InputMethodInfo} of the IME specified by the <code>packageName</code>,
-     * or null if not found.
-     */
-    /* package */ static InputMethodInfo getInputMethodInfoOf(final String packageName,
-            final InputMethodManager imm) {
-        for (final InputMethodInfo imi : imm.getInputMethodList()) {
-            if (packageName.equals(imi.getPackageName())) {
-                return imi;
-            }
-        }
-        return null;
-    }
 }
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java
index bcac05a..e455e53 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java
+++ b/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java
@@ -38,6 +38,7 @@
 import com.android.inputmethod.latin.R;
 import com.android.inputmethod.latin.settings.SettingsActivity;
 import com.android.inputmethod.latin.utils.LeakGuardHandlerWrapper;
+import com.android.inputmethod.latin.utils.UncachedInputMethodManagerUtils;
 
 import java.util.ArrayList;
 
@@ -93,7 +94,8 @@
             }
             switch (msg.what) {
             case MSG_POLLING_IME_SETTINGS:
-                if (SetupActivity.isThisImeEnabled(setupWizardActivity, mImmInHandler)) {
+                if (UncachedInputMethodManagerUtils.isThisImeEnabled(setupWizardActivity,
+                        mImmInHandler)) {
                     setupWizardActivity.invokeSetupWizardOfThisIme();
                     return;
                 }
@@ -277,7 +279,8 @@
     }
 
     void invokeSubtypeEnablerOfThisIme() {
-        final InputMethodInfo imi = SetupActivity.getInputMethodInfoOf(getPackageName(), mImm);
+        final InputMethodInfo imi =
+                UncachedInputMethodManagerUtils.getInputMethodInfoOf(getPackageName(), mImm);
         if (imi == null) {
             return;
         }
@@ -301,10 +304,10 @@
 
     private int determineSetupStepNumber() {
         mHandler.cancelPollingImeSettings();
-        if (!SetupActivity.isThisImeEnabled(this, mImm)) {
+        if (!UncachedInputMethodManagerUtils.isThisImeEnabled(this, mImm)) {
             return STEP_1;
         }
-        if (!SetupActivity.isThisImeCurrent(this, mImm)) {
+        if (!UncachedInputMethodManagerUtils.isThisImeCurrent(this, mImm)) {
             return STEP_2;
         }
         return STEP_3;
diff --git a/java/src/com/android/inputmethod/latin/utils/PrevWordsInfoUtils.java b/java/src/com/android/inputmethod/latin/utils/PrevWordsInfoUtils.java
new file mode 100644
index 0000000..3cd6361
--- /dev/null
+++ b/java/src/com/android/inputmethod/latin/utils/PrevWordsInfoUtils.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.latin.utils;
+
+import java.util.regex.Pattern;
+
+import com.android.inputmethod.latin.Constants;
+import com.android.inputmethod.latin.PrevWordsInfo;
+import com.android.inputmethod.latin.PrevWordsInfo.WordInfo;
+import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
+
+public final class PrevWordsInfoUtils {
+    private PrevWordsInfoUtils() {
+        // Intentional empty constructor for utility class.
+    }
+
+    private static final Pattern SPACE_REGEX = Pattern.compile("\\s+");
+    // Get context information from nth word before the cursor. n = 1 retrieves the words
+    // immediately before the cursor, n = 2 retrieves the words before that, and so on. This splits
+    // on whitespace only.
+    // Also, it won't return words that end in a separator (if the nth word before the cursor
+    // ends in a separator, it returns information representing beginning-of-sentence).
+    // Example (when Constants.MAX_PREV_WORD_COUNT_FOR_N_GRAM is 2):
+    // (n = 1) "abc def|" -> abc, def
+    // (n = 1) "abc def |" -> abc, def
+    // (n = 1) "abc 'def|" -> empty, 'def
+    // (n = 1) "abc def. |" -> beginning-of-sentence
+    // (n = 1) "abc def . |" -> beginning-of-sentence
+    // (n = 2) "abc def|" -> beginning-of-sentence, abc
+    // (n = 2) "abc def |" -> beginning-of-sentence, abc
+    // (n = 2) "abc 'def|" -> empty. The context is different from "abc def", but we cannot
+    // represent this situation using PrevWordsInfo. See TODO in the method.
+    // TODO: The next example's result should be "abc, def". This have to be fixed before we
+    // retrieve the prior context of Beginning-of-Sentence.
+    // (n = 2) "abc def. |" -> beginning-of-sentence, abc
+    // (n = 2) "abc def . |" -> abc, def
+    // (n = 2) "abc|" -> beginning-of-sentence
+    // (n = 2) "abc |" -> beginning-of-sentence
+    // (n = 2) "abc. def|" -> beginning-of-sentence
+    public static PrevWordsInfo getPrevWordsInfoFromNthPreviousWord(final CharSequence prev,
+            final SpacingAndPunctuations spacingAndPunctuations, final int n) {
+        if (prev == null) return PrevWordsInfo.EMPTY_PREV_WORDS_INFO;
+        final String[] w = SPACE_REGEX.split(prev);
+        final WordInfo[] prevWordsInfo = new WordInfo[Constants.MAX_PREV_WORD_COUNT_FOR_N_GRAM];
+        for (int i = 0; i < prevWordsInfo.length; i++) {
+            final int focusedWordIndex = w.length - n - i;
+            // Referring to the word after the focused word.
+            if ((focusedWordIndex + 1) >= 0 && (focusedWordIndex + 1) < w.length) {
+                final String wordFollowingTheNthPrevWord = w[focusedWordIndex + 1];
+                if (!wordFollowingTheNthPrevWord.isEmpty()) {
+                    final char firstChar = wordFollowingTheNthPrevWord.charAt(0);
+                    if (spacingAndPunctuations.isWordConnector(firstChar)) {
+                        // The word following the focused word is starting with a word connector.
+                        // TODO: Return meaningful context for this case.
+                        prevWordsInfo[i] = WordInfo.EMPTY_WORD_INFO;
+                        break;
+                    }
+                }
+            }
+            // If we can't find (n + i) words, the context is beginning-of-sentence.
+            if (focusedWordIndex < 0) {
+                prevWordsInfo[i] = WordInfo.BEGINNING_OF_SENTENCE;
+                break;
+            }
+            final String focusedWord = w[focusedWordIndex];
+            // If the word is, the context is beginning-of-sentence.
+            final int length = focusedWord.length();
+            if (length <= 0) {
+                prevWordsInfo[i] = WordInfo.BEGINNING_OF_SENTENCE;
+                break;
+            }
+            // If ends in a sentence separator, the context is beginning-of-sentence.
+            final char lastChar = focusedWord.charAt(length - 1);
+            if (spacingAndPunctuations.isSentenceSeparator(lastChar)) {
+                prevWordsInfo[i] = WordInfo.BEGINNING_OF_SENTENCE;
+                break;
+            }
+            // If ends in a word separator or connector, the context is unclear.
+            // TODO: Return meaningful context for this case.
+            if (spacingAndPunctuations.isWordSeparator(lastChar)
+                    || spacingAndPunctuations.isWordConnector(lastChar)) {
+                prevWordsInfo[i] = WordInfo.EMPTY_WORD_INFO;
+                break;
+            }
+            prevWordsInfo[i] = new WordInfo(focusedWord);
+        }
+        return new PrevWordsInfo(prevWordsInfo);
+    }
+}
diff --git a/java/src/com/android/inputmethod/latin/utils/UncachedInputMethodManagerUtils.java b/java/src/com/android/inputmethod/latin/utils/UncachedInputMethodManagerUtils.java
new file mode 100644
index 0000000..5df00ef
--- /dev/null
+++ b/java/src/com/android/inputmethod/latin/utils/UncachedInputMethodManagerUtils.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.latin.utils;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+
+/*
+ * A utility class for {@link InputMethodManager}. Unlike {@link RichInputMethodManager}, this
+ * class provides synchronous, non-cached access to {@link InputMethodManager}. The setup activity
+ * is a good example to use this class because {@link InputMethodManagerService} may not be aware of
+ * this IME immediately after this IME is installed.
+ */
+public final class UncachedInputMethodManagerUtils {
+    /**
+     * Check if the IME specified by the context is enabled.
+     * CAVEAT: This may cause a round trip IPC.
+     *
+     * @param context package context of the IME to be checked.
+     * @param imm the {@link InputMethodManager}.
+     * @return true if this IME is enabled.
+     */
+    public static boolean isThisImeEnabled(final Context context,
+            final InputMethodManager imm) {
+        final String packageName = context.getPackageName();
+        for (final InputMethodInfo imi : imm.getEnabledInputMethodList()) {
+            if (packageName.equals(imi.getPackageName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check if the IME specified by the context is the current IME.
+     * CAVEAT: This may cause a round trip IPC.
+     *
+     * @param context package context of the IME to be checked.
+     * @param imm the {@link InputMethodManager}.
+     * @return true if this IME is the current IME.
+     */
+    public static boolean isThisImeCurrent(final Context context,
+            final InputMethodManager imm) {
+        final InputMethodInfo imi = getInputMethodInfoOf(context.getPackageName(), imm);
+        final String currentImeId = Settings.Secure.getString(
+                context.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
+        return imi != null && imi.getId().equals(currentImeId);
+    }
+
+    /**
+     * Get {@link InputMethodInfo} of the IME specified by the package name.
+     * CAVEAT: This may cause a round trip IPC.
+     *
+     * @param packageName package name of the IME.
+     * @param imm the {@link InputMethodManager}.
+     * @return the {@link InputMethodInfo} of the IME specified by the <code>packageName</code>,
+     * or null if not found.
+     */
+    public static InputMethodInfo getInputMethodInfoOf(final String packageName,
+            final InputMethodManager imm) {
+        for (final InputMethodInfo imi : imm.getInputMethodList()) {
+            if (packageName.equals(imi.getPackageName())) {
+                return imi;
+            }
+        }
+        return null;
+    }
+}
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.cpp
index 7a52fd1..146cab6 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.cpp
@@ -71,8 +71,14 @@
         const BigramEntry bigramEntryToWrite = createUpdatedBigramEntryFrom(&newBigramEntry,
                 bigramProperty);
         // Write an entry.
-        const int writingPos =  mBigramDictContent->getBigramListHeadPos(terminalId);
-        if (!mBigramDictContent->writeBigramEntry(&bigramEntryToWrite, writingPos)) {
+        int writingPos =  mBigramDictContent->getBigramListHeadPos(terminalId);
+        if (!mBigramDictContent->writeBigramEntryAndAdvancePosition(&bigramEntryToWrite,
+                &writingPos)) {
+            AKLOGE("Cannot write bigram entry. pos: %d.", writingPos);
+            return false;
+        }
+        if (!mBigramDictContent->writeTerminator(writingPos)) {
+            AKLOGE("Cannot write bigram list terminator. pos: %d.", writingPos);
             return false;
         }
         if (outAddedNewEntry) {
@@ -84,32 +90,37 @@
     int tailEntryPos = NOT_A_DICT_POS;
     const int entryPosToUpdate = getEntryPosToUpdate(newTargetTerminalId, bigramListPos,
             &tailEntryPos);
-    if (tailEntryPos != NOT_A_DICT_POS || entryPosToUpdate == NOT_A_DICT_POS) {
-        // Case 4, 5.
-        // Add new entry to the bigram list.
-        if (tailEntryPos == NOT_A_DICT_POS) {
-            // Case 4. Create new bigram list.
-            if (!mBigramDictContent->createNewBigramList(terminalId)) {
-                return false;
-            }
-            const int destPos = mBigramDictContent->getBigramListHeadPos(terminalId);
-            // Copy existing bigram list.
-            if (!mBigramDictContent->copyBigramList(bigramListPos, destPos, &tailEntryPos)) {
-                return false;
-            }
-        }
+    if (entryPosToUpdate == NOT_A_DICT_POS) {
+        // Case 4, 5. Add new entry to the bigram list.
+        const int contentTailPos = mBigramDictContent->getContentTailPos();
+        // If the tail entry is at the tail of content buffer, the new entry can be written without
+        // link (Case 5).
+        const bool canAppendEntry =
+                contentTailPos == tailEntryPos + mBigramDictContent->getBigramEntrySize();
+        const int newEntryPos = canAppendEntry ? tailEntryPos : contentTailPos;
+        int writingPos = newEntryPos;
         // Write new entry at the tail position of the bigram content.
         const BigramEntry newBigramEntry(false /* hasNext */, NOT_A_PROBABILITY,
                 newTargetTerminalId);
         const BigramEntry bigramEntryToWrite = createUpdatedBigramEntryFrom(
                 &newBigramEntry, bigramProperty);
-        if (!mBigramDictContent->writeBigramEntryAtTail(&bigramEntryToWrite)) {
+        if (!mBigramDictContent->writeBigramEntryAndAdvancePosition(&bigramEntryToWrite,
+                &writingPos)) {
+            AKLOGE("Cannot write bigram entry. pos: %d.", writingPos);
             return false;
         }
-        // Update has next flag of the tail entry.
-        if (!updateHasNextFlag(true /* hasNext */, tailEntryPos)) {
+        if (!mBigramDictContent->writeTerminator(writingPos)) {
+            AKLOGE("Cannot write bigram list terminator. pos: %d.", writingPos);
             return false;
         }
+        if (!canAppendEntry) {
+            // Update link of the current tail entry.
+            if (!mBigramDictContent->writeLink(newEntryPos, tailEntryPos)) {
+                AKLOGE("Cannot update bigram entry link. pos: %d, linked entry pos: %d.",
+                        tailEntryPos, newEntryPos);
+                return false;
+            }
+        }
         if (outAddedNewEntry) {
             *outAddedNewEntry = true;
         }
@@ -228,14 +239,18 @@
     if (outTailEntryPos) {
         *outTailEntryPos = NOT_A_DICT_POS;
     }
-    bool hasNext = true;
     int invalidEntryPos = NOT_A_DICT_POS;
     int readingPos = bigramListPos;
-    while (hasNext) {
-        const int entryPos = readingPos;
+    while (true) {
         const BigramEntry bigramEntry =
                 mBigramDictContent->getBigramEntryAndAdvancePosition(&readingPos);
-        hasNext = bigramEntry.hasNext();
+        const int entryPos = readingPos - mBigramDictContent->getBigramEntrySize();
+        if (!bigramEntry.hasNext()) {
+            if (outTailEntryPos) {
+                *outTailEntryPos = entryPos;
+            }
+            break;
+        }
         if (bigramEntry.getTargetTerminalId() == targetTerminalIdToFind) {
             // Entry with same target is found.
             return entryPos;
@@ -243,11 +258,6 @@
             // Invalid entry that can be reused is found.
             invalidEntryPos = entryPos;
         }
-        if (!hasNext && mBigramDictContent->isContentTailPos(readingPos)) {
-            if (outTailEntryPos) {
-                *outTailEntryPos = entryPos;
-            }
-        }
     }
     return invalidEntryPos;
 }
@@ -269,10 +279,4 @@
     }
 }
 
-bool Ver4BigramListPolicy::updateHasNextFlag(const bool hasNext, const int bigramEntryPos) {
-    const BigramEntry bigramEntry = mBigramDictContent->getBigramEntry(bigramEntryPos);
-    const BigramEntry updatedBigramEntry = bigramEntry.updateHasNextAndGetEntry(hasNext);
-    return mBigramDictContent->writeBigramEntry(&updatedBigramEntry, bigramEntryPos);
-}
-
 } // namespace latinime
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.h
index 1613941..55ba613 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.h
@@ -63,8 +63,6 @@
     const BigramEntry createUpdatedBigramEntryFrom(const BigramEntry *const originalBigramEntry,
             const BigramProperty *const bigramProperty) const;
 
-    bool updateHasNextFlag(const bool hasNext, const int bigramEntryPos);
-
     BigramDictContent *const mBigramDictContent;
     const TerminalPositionLookupTable *const mTerminalPositionLookupTable;
     const HeaderPolicy *const mHeaderPolicy;
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp
index e1ceaee..d7e1952 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp
@@ -20,6 +20,8 @@
 
 namespace latinime {
 
+const int BigramDictContent::INVALID_LINKED_ENTRY_POS = Ver4DictConstants::NOT_A_TERMINAL_ID;
+
 const BigramEntry BigramDictContent::getBigramEntryAndAdvancePosition(
         int *const bigramEntryPos) const {
     const BufferWithExtendableBuffer *const bigramListBuffer = getContentBuffer();
@@ -34,7 +36,7 @@
     }
     const int bigramFlags = bigramListBuffer->readUintAndAdvancePosition(
             Ver4DictConstants::BIGRAM_FLAGS_FIELD_SIZE, bigramEntryPos);
-    const bool hasNext = (bigramFlags & Ver4DictConstants::BIGRAM_HAS_NEXT_MASK) != 0;
+    const bool isLink = (bigramFlags & Ver4DictConstants::BIGRAM_IS_LINK_MASK) != 0;
     int probability = NOT_A_PROBABILITY;
     int timestamp = NOT_A_TIMESTAMP;
     int level = 0;
@@ -55,81 +57,90 @@
     const int targetTerminalId =
             (encodedTargetTerminalId == Ver4DictConstants::INVALID_BIGRAM_TARGET_TERMINAL_ID) ?
                     Ver4DictConstants::NOT_A_TERMINAL_ID : encodedTargetTerminalId;
+    if (isLink) {
+        const int linkedEntryPos = targetTerminalId;
+        if (linkedEntryPos == INVALID_LINKED_ENTRY_POS) {
+            // Bigram list terminator is found.
+            return BigramEntry(false /* hasNext */, NOT_A_PROBABILITY,
+                    Ver4DictConstants::NOT_A_TERMINAL_ID);
+        }
+        *bigramEntryPos = linkedEntryPos;
+        return getBigramEntryAndAdvancePosition(bigramEntryPos);
+    }
+    // hasNext is always true because we should continue to read the next entry until the terminator
+    // is found.
     if (mHasHistoricalInfo) {
         const HistoricalInfo historicalInfo(timestamp, level, count);
-        return BigramEntry(hasNext, probability, &historicalInfo, targetTerminalId);
+        return BigramEntry(true /* hasNext */, probability, &historicalInfo, targetTerminalId);
     } else {
-        return BigramEntry(hasNext, probability, targetTerminalId);
+        return BigramEntry(true /* hasNext */, probability, targetTerminalId);
     }
 }
 
 bool BigramDictContent::writeBigramEntryAndAdvancePosition(
         const BigramEntry *const bigramEntryToWrite, int *const entryWritingPos) {
+    return writeBigramEntryAttributesAndAdvancePosition(false /* isLink */,
+            bigramEntryToWrite->getProbability(), bigramEntryToWrite->getTargetTerminalId(),
+            bigramEntryToWrite->getHistoricalInfo()->getTimeStamp(),
+            bigramEntryToWrite->getHistoricalInfo()->getLevel(),
+            bigramEntryToWrite->getHistoricalInfo()->getCount(),
+            entryWritingPos);
+}
+
+bool BigramDictContent::writeBigramEntryAttributesAndAdvancePosition(
+        const bool isLink, const int probability, const int targetTerminalId,
+        const int timestamp, const int level, const int count, int *const entryWritingPos) {
     BufferWithExtendableBuffer *const bigramListBuffer = getWritableContentBuffer();
-    const int bigramFlags = createAndGetBigramFlags(bigramEntryToWrite->hasNext());
+    const int bigramFlags = isLink ? Ver4DictConstants::BIGRAM_IS_LINK_MASK : 0;
     if (!bigramListBuffer->writeUintAndAdvancePosition(bigramFlags,
             Ver4DictConstants::BIGRAM_FLAGS_FIELD_SIZE, entryWritingPos)) {
         AKLOGE("Cannot write bigram flags. pos: %d, flags: %x", *entryWritingPos, bigramFlags);
         return false;
     }
     if (mHasHistoricalInfo) {
-        const HistoricalInfo *const historicalInfo = bigramEntryToWrite->getHistoricalInfo();
-        if (!bigramListBuffer->writeUintAndAdvancePosition(historicalInfo->getTimeStamp(),
+        if (!bigramListBuffer->writeUintAndAdvancePosition(timestamp,
                 Ver4DictConstants::TIME_STAMP_FIELD_SIZE, entryWritingPos)) {
             AKLOGE("Cannot write bigram timestamps. pos: %d, timestamp: %d", *entryWritingPos,
-                    historicalInfo->getTimeStamp());
+                    timestamp);
             return false;
         }
-        if (!bigramListBuffer->writeUintAndAdvancePosition(historicalInfo->getLevel(),
+        if (!bigramListBuffer->writeUintAndAdvancePosition(level,
                 Ver4DictConstants::WORD_LEVEL_FIELD_SIZE, entryWritingPos)) {
             AKLOGE("Cannot write bigram level. pos: %d, level: %d", *entryWritingPos,
-                    historicalInfo->getLevel());
+                    level);
             return false;
         }
-        if (!bigramListBuffer->writeUintAndAdvancePosition(historicalInfo->getCount(),
+        if (!bigramListBuffer->writeUintAndAdvancePosition(count,
                 Ver4DictConstants::WORD_COUNT_FIELD_SIZE, entryWritingPos)) {
             AKLOGE("Cannot write bigram count. pos: %d, count: %d", *entryWritingPos,
-                    historicalInfo->getCount());
+                    count);
             return false;
         }
     } else {
-        if (!bigramListBuffer->writeUintAndAdvancePosition(bigramEntryToWrite->getProbability(),
+        if (!bigramListBuffer->writeUintAndAdvancePosition(probability,
                 Ver4DictConstants::PROBABILITY_SIZE, entryWritingPos)) {
             AKLOGE("Cannot write bigram probability. pos: %d, probability: %d", *entryWritingPos,
-                    bigramEntryToWrite->getProbability());
+                    probability);
             return false;
         }
     }
-    const int targetTerminalIdToWrite =
-            (bigramEntryToWrite->getTargetTerminalId() == Ver4DictConstants::NOT_A_TERMINAL_ID) ?
-                    Ver4DictConstants::INVALID_BIGRAM_TARGET_TERMINAL_ID :
-                            bigramEntryToWrite->getTargetTerminalId();
+    const int targetTerminalIdToWrite = (targetTerminalId == Ver4DictConstants::NOT_A_TERMINAL_ID) ?
+            Ver4DictConstants::INVALID_BIGRAM_TARGET_TERMINAL_ID : targetTerminalId;
     if (!bigramListBuffer->writeUintAndAdvancePosition(targetTerminalIdToWrite,
             Ver4DictConstants::BIGRAM_TARGET_TERMINAL_ID_FIELD_SIZE, entryWritingPos)) {
         AKLOGE("Cannot write bigram target terminal id. pos: %d, target terminal id: %d",
-                *entryWritingPos, bigramEntryToWrite->getTargetTerminalId());
+                *entryWritingPos, targetTerminalId);
         return false;
     }
     return true;
 }
 
-bool BigramDictContent::copyBigramList(const int bigramListPos, const int toPos,
-        int *const outTailEntryPos) {
-    int readingPos = bigramListPos;
-    int writingPos = toPos;
-    bool hasNext = true;
-    while (hasNext) {
-        const BigramEntry bigramEntry = getBigramEntryAndAdvancePosition(&readingPos);
-        hasNext = bigramEntry.hasNext();
-        if (!hasNext) {
-            *outTailEntryPos = writingPos;
-        }
-        if (!writeBigramEntryAndAdvancePosition(&bigramEntry, &writingPos)) {
-            AKLOGE("Cannot write bigram entry to copy. pos: %d", writingPos);
-            return false;
-        }
-    }
-    return true;
+bool BigramDictContent::writeLink(const int linkedEntryPos, const int writingPos) {
+    const int targetTerminalId = linkedEntryPos;
+    int pos = writingPos;
+    return writeBigramEntryAttributesAndAdvancePosition(true /* isLink */,
+            NOT_A_PROBABILITY /* probability */, targetTerminalId, NOT_A_TIMESTAMP, 0 /* level */,
+            0 /* count */, &pos);
 }
 
 bool BigramDictContent::runGC(const TerminalPositionLookupTable::TerminalIdMap *const terminalIdMap,
@@ -171,16 +182,15 @@
 bool BigramDictContent::runGCBigramList(const int bigramListPos,
         const BigramDictContent *const sourceBigramDictContent, const int toPos,
         const TerminalPositionLookupTable::TerminalIdMap *const terminalIdMap,
-        int *const outEntrycount) {
+        int *const outEntryCount) {
     bool hasNext = true;
     int readingPos = bigramListPos;
     int writingPos = toPos;
-    int lastEntryPos = NOT_A_DICT_POS;
     while (hasNext) {
         const BigramEntry originalBigramEntry =
                 sourceBigramDictContent->getBigramEntryAndAdvancePosition(&readingPos);
         hasNext = originalBigramEntry.hasNext();
-        if (originalBigramEntry.getTargetTerminalId() == Ver4DictConstants::NOT_A_TERMINAL_ID) {
+        if (!originalBigramEntry.isValid()) {
             continue;
         }
         TerminalPositionLookupTable::TerminalIdMap::const_iterator it =
@@ -189,21 +199,17 @@
             // Target word has been removed.
             continue;
         }
-        lastEntryPos = hasNext ? writingPos : NOT_A_DICT_POS;
         const BigramEntry updatedBigramEntry =
                 originalBigramEntry.updateTargetTerminalIdAndGetEntry(it->second);
         if (!writeBigramEntryAndAdvancePosition(&updatedBigramEntry, &writingPos)) {
             AKLOGE("Cannot write bigram entry to run GC. pos: %d", writingPos);
             return false;
         }
-        *outEntrycount += 1;
+        *outEntryCount += 1;
     }
-    if (lastEntryPos != NOT_A_DICT_POS) {
-        // Update has next flag in the last written entry.
-        const BigramEntry bigramEntry = getBigramEntry(lastEntryPos).updateHasNextAndGetEntry(
-                false /* hasNext */);
-        if (!writeBigramEntry(&bigramEntry, lastEntryPos)) {
-            AKLOGE("Cannot write bigram entry to set hasNext flag after GC. pos: %d", writingPos);
+    if (*outEntryCount > 0) {
+        if (!writeTerminator(writingPos)) {
+            AKLOGE("Cannot write terminator to run GC. pos: %d", writingPos);
             return false;
         }
     }
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h
index 52447a3..033f18e 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h
@@ -42,6 +42,10 @@
                       Ver4DictConstants::BIGRAM_ADDRESS_TABLE_DATA_SIZE),
               mHasHistoricalInfo(hasHistoricalInfo) {}
 
+    int getContentTailPos() const {
+        return getContentBuffer()->getTailPosition();
+    }
+
     const BigramEntry getBigramEntry(const int bigramEntryPos) const {
         int readingPos = bigramEntryPos;
         return getBigramEntryAndAdvancePosition(&readingPos);
@@ -71,13 +75,18 @@
     bool writeBigramEntryAndAdvancePosition(const BigramEntry *const bigramEntryToWrite,
             int *const entryWritingPos);
 
+    bool writeTerminator(const int writingPos) {
+        // Terminator is a link to the invalid position.
+        return writeLink(INVALID_LINKED_ENTRY_POS, writingPos);
+    }
+
+    bool writeLink(const int linkedPos, const int writingPos);
+
     bool createNewBigramList(const int terminalId) {
         const int bigramListPos = getContentBuffer()->getTailPosition();
         return getUpdatableAddressLookupTable()->set(terminalId, bigramListPos);
     }
 
-    bool copyBigramList(const int bigramListPos, const int toPos, int *const outTailEntryPos);
-
     bool flushToFile(const char *const dictPath) const {
         return flush(dictPath, Ver4DictConstants::BIGRAM_LOOKUP_TABLE_FILE_EXTENSION,
                 Ver4DictConstants::BIGRAM_CONTENT_TABLE_FILE_EXTENSION,
@@ -88,17 +97,6 @@
             const BigramDictContent *const originalBigramDictContent,
             int *const outBigramEntryCount);
 
-    bool isContentTailPos(const int pos) const {
-        return pos == getContentBuffer()->getTailPosition();
-    }
-
- private:
-    DISALLOW_COPY_AND_ASSIGN(BigramDictContent);
-
-    int createAndGetBigramFlags(const bool hasNext) const {
-        return hasNext ? Ver4DictConstants::BIGRAM_HAS_NEXT_MASK : 0;
-    }
-
     int getBigramEntrySize() const {
         if (mHasHistoricalInfo) {
             return Ver4DictConstants::BIGRAM_FLAGS_FIELD_SIZE
@@ -113,6 +111,15 @@
         }
     }
 
+ private:
+    DISALLOW_COPY_AND_ASSIGN(BigramDictContent);
+
+    static const int INVALID_LINKED_ENTRY_POS;
+
+    bool writeBigramEntryAttributesAndAdvancePosition(
+            const bool isLink, const int probability, const int targetTerminalId,
+            const int timestamp, const int level, const int count, int *const entryWritingPos);
+
     bool runGCBigramList(const int bigramListPos,
             const BigramDictContent *const sourceBigramDictContent, const int toPos,
             const TerminalPositionLookupTable::TerminalIdMap *const terminalIdMap,
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp
index deed010..345cabb 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp
@@ -60,7 +60,7 @@
         (1 << (BIGRAM_TARGET_TERMINAL_ID_FIELD_SIZE * 8)) - 1;
 const int Ver4DictConstants::BIGRAM_FLAGS_FIELD_SIZE = 1;
 const int Ver4DictConstants::BIGRAM_PROBABILITY_MASK = 0x0F;
-const int Ver4DictConstants::BIGRAM_HAS_NEXT_MASK = 0x80;
+const int Ver4DictConstants::BIGRAM_IS_LINK_MASK = 0x80;
 const int Ver4DictConstants::BIGRAM_LARGE_PROBABILITY_FIELD_SIZE = 1;
 
 const int Ver4DictConstants::SHORTCUT_FLAGS_FIELD_SIZE = 1;
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h
index d6d22c5..b4effca 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h
@@ -57,8 +57,8 @@
     static const int BIGRAM_FLAGS_FIELD_SIZE;
     static const int BIGRAM_TARGET_TERMINAL_ID_FIELD_SIZE;
     static const int INVALID_BIGRAM_TARGET_TERMINAL_ID;
+    static const int BIGRAM_IS_LINK_MASK;
     static const int BIGRAM_PROBABILITY_MASK;
-    static const int BIGRAM_HAS_NEXT_MASK;
     // Used when bigram list has time stamp.
     static const int BIGRAM_LARGE_PROBABILITY_FIELD_SIZE;
 
diff --git a/tests/src/com/android/inputmethod/compat/LocaleSpanCompatUtilsTests.java b/tests/src/com/android/inputmethod/compat/LocaleSpanCompatUtilsTests.java
index a920373..319302c 100644
--- a/tests/src/com/android/inputmethod/compat/LocaleSpanCompatUtilsTests.java
+++ b/tests/src/com/android/inputmethod/compat/LocaleSpanCompatUtilsTests.java
@@ -16,9 +16,14 @@
 
 package com.android.inputmethod.compat;
 
+import android.graphics.Typeface;
 import android.os.Build;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.StyleSpan;
 
 import java.util.Locale;
 
@@ -35,4 +40,173 @@
         assertEquals(Locale.JAPANESE,
                 LocaleSpanCompatUtils.getLocaleFromLocaleSpan(japaneseLocaleSpan));
     }
+
+    private static void assertLocaleSpan(final Spanned spanned, final int index,
+            final int expectedStart, final int expectedEnd,
+            final Locale expectedLocale, final int expectedSpanFlags) {
+        final Object span = spanned.getSpans(0, spanned.length(), Object.class)[index];
+        assertEquals(expectedLocale, LocaleSpanCompatUtils.getLocaleFromLocaleSpan(span));
+        assertEquals(expectedStart, spanned.getSpanStart(span));
+        assertEquals(expectedEnd, spanned.getSpanEnd(span));
+        assertEquals(expectedSpanFlags, spanned.getSpanFlags(span));
+    }
+
+    private static void assertSpanEquals(final Object expectedSpan, final Spanned spanned,
+            final int index) {
+        final Object[] spans = spanned.getSpans(0, spanned.length(), Object.class);
+        assertEquals(expectedSpan, spans[index]);
+    }
+
+    private static void assertSpanCount(final int expectedCount, final Spanned spanned) {
+        final Object[] spans = spanned.getSpans(0, spanned.length(), Object.class);
+        assertEquals(expectedCount, spans.length);
+    }
+
+    public void testUpdateLocaleSpan() {
+        if (!LocaleSpanCompatUtils.isLocaleSpanAvailable()) {
+            return;
+        }
+
+        // Test if the simplest case works.
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 1, 5, Locale.JAPANESE);
+            assertSpanCount(1, text);
+            assertLocaleSpan(text, 0, 1, 5, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // Test if only LocaleSpans are updated.
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            final StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
+            text.setSpan(styleSpan, 0, 7, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 1, 5, Locale.JAPANESE);
+            assertSpanCount(2, text);
+            assertSpanEquals(styleSpan, text, 0);
+            assertLocaleSpan(text, 1, 1, 5, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // Test if two jointed spans are merged into one span.
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.JAPANESE), 1, 3,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 3, 5, Locale.JAPANESE);
+            assertSpanCount(1, text);
+            assertLocaleSpan(text, 0, 1, 5, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // Test if two overlapped spans are merged into one span.
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.JAPANESE), 1, 4,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 3, 5, Locale.JAPANESE);
+            assertSpanCount(1, text);
+            assertLocaleSpan(text, 0, 1, 5, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // Test if three overlapped spans are merged into one span.
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.JAPANESE), 1, 4,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.JAPANESE), 5, 6,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 2, 8, Locale.JAPANESE);
+            assertSpanCount(1, text);
+            assertLocaleSpan(text, 0, 1, 8, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // Test if disjoint spans remain disjoint.
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.JAPANESE), 1, 3,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.JAPANESE), 5, 6,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 8, 9, Locale.JAPANESE);
+            assertSpanCount(3, text);
+            assertLocaleSpan(text, 0, 1, 3, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            assertLocaleSpan(text, 1, 5, 6, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            assertLocaleSpan(text, 2, 8, 9, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // Test if existing span flags are preserved during merge.
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.JAPANESE), 1, 5,
+                    Spannable.SPAN_INCLUSIVE_INCLUSIVE | Spannable.SPAN_INTERMEDIATE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 3, 4, Locale.JAPANESE);
+            assertSpanCount(1, text);
+            assertLocaleSpan(text, 0, 1, 5, Locale.JAPANESE,
+                    Spannable.SPAN_INCLUSIVE_INCLUSIVE | Spannable.SPAN_INTERMEDIATE);
+        }
+
+        // Test if existing span flags are preserved even when partially overlapped (leading edge).
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.JAPANESE), 1, 5,
+                    Spannable.SPAN_INCLUSIVE_INCLUSIVE | Spannable.SPAN_INTERMEDIATE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 3, 7, Locale.JAPANESE);
+            assertSpanCount(1, text);
+            assertLocaleSpan(text, 0, 1, 7, Locale.JAPANESE,
+                    Spannable.SPAN_INCLUSIVE_EXCLUSIVE | Spannable.SPAN_INTERMEDIATE);
+        }
+
+        // Test if existing span flags are preserved even when partially overlapped (trailing edge).
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.JAPANESE), 3, 7,
+                    Spannable.SPAN_INCLUSIVE_INCLUSIVE | Spannable.SPAN_INTERMEDIATE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 1, 5, Locale.JAPANESE);
+            assertSpanCount(1, text);
+            assertLocaleSpan(text, 0, 1, 7, Locale.JAPANESE,
+                    Spannable.SPAN_EXCLUSIVE_INCLUSIVE | Spannable.SPAN_INTERMEDIATE);
+        }
+
+        // Test if existing locale span will be removed when the locale doesn't match.
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.ENGLISH), 3, 5,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 1, 7, Locale.JAPANESE);
+            assertSpanCount(1, text);
+            assertLocaleSpan(text, 0, 1, 7, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // Test if existing locale span will be removed when the locale doesn't match. (case 2)
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.ENGLISH), 3, 7,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 5, 6, Locale.JAPANESE);
+            assertSpanCount(3, text);
+            assertLocaleSpan(text, 0, 3, 5, Locale.ENGLISH, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            assertLocaleSpan(text, 1, 6, 7, Locale.ENGLISH, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            assertLocaleSpan(text, 2, 5, 6, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // Test if existing locale span will be removed when the locale doesn't match. (case 3)
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.ENGLISH), 3, 7,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 2, 5, Locale.JAPANESE);
+            assertSpanCount(2, text);
+            assertLocaleSpan(text, 0, 5, 7, Locale.ENGLISH, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            assertLocaleSpan(text, 1, 2, 5, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        // Test if existing locale span will be removed when the locale doesn't match. (case 3)
+        {
+            final SpannableString text = new SpannableString("0123456789");
+            text.setSpan(LocaleSpanCompatUtils.newLocaleSpan(Locale.ENGLISH), 3, 7,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            LocaleSpanCompatUtils.updateLocaleSpan(text, 5, 8, Locale.JAPANESE);
+            assertSpanCount(2, text);
+            assertLocaleSpan(text, 0, 3, 5, Locale.ENGLISH, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            assertLocaleSpan(text, 1, 5, 8, Locale.JAPANESE, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+    }
 }
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java b/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java
index bfd94d5..5c0ffb4 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java
@@ -129,25 +129,17 @@
     private static final ExpectedKey[][] ALPHABET_SHIFTED_COMMON = new ExpectedKeyboardBuilder()
             .setKeysOfRow(1,
                     // U+0DD6: "ූ" SINHALA VOWEL SIGN DIGA PAA-PILLA
-                    key("\u0DD6", moreKey("1")),
                     // U+0D8B: "උ" SINHALA LETTER UYANNA
-                    key("\u0D8B", moreKey("2")),
                     // U+0DD1: "ෑ" SINHALA VOWEL SIGN DIGA AEDA-PILLA
-                    key("\u0DD1", moreKey("3")),
                     // U+0D8D: "ඍ" SINHALA LETTER IRUYANNA
-                    key("\u0D8D", moreKey("4")),
                     // U+0D94: "ඔ" SINHALA LETTER OYANNA
-                    key("\u0D94", moreKey("5")),
                     // U+0DC1: "ශ" SINHALA LETTER TAALUJA SAYANNA
-                    key("\u0DC1", moreKey("6")),
                     // U+0DB9: "ඹ" SINHALA LETTER AMBA BAYANNA
-                    key("\u0DB9", moreKey("7")),
                     // U+0DC2: "ෂ" SINHALA LETTER MUURDHAJA SAYANNA
-                    key("\u0DC2", moreKey("8")),
                     // U+0DB0: "ධ" SINHALA LETTER MAHAAPRAANA DAYANNA
-                    key("\u0DB0", moreKey("9")),
                     // U+0DA1: "ඡ" SINHALA LETTER MAHAAPRAANA CAYANNA
-                    key("\u0DA1", moreKey("0")),
+                    "\u0DD6", "\u0D8B", "\u0DD1", "\u0D8D", "\u0D94", "\u0DC1", "\u0DB9", "\u0DC2",
+                    "\u0DB0", "\u0DA1",
                     // U+0DA5: "ඥ" SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA
                     // U+0DF4: "෴" SINHALA PUNCTUATION KUNDDALIYA
                     key("\u0DA5", moreKey("\u0DF4")))
diff --git a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
index 2d92e69..1999224 100644
--- a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
+++ b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
@@ -32,6 +32,7 @@
 
 import com.android.inputmethod.latin.PrevWordsInfo.WordInfo;
 import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
+import com.android.inputmethod.latin.utils.PrevWordsInfoUtils;
 import com.android.inputmethod.latin.utils.RunInLocale;
 import com.android.inputmethod.latin.utils.ScriptUtils;
 import com.android.inputmethod.latin.utils.StringUtils;
@@ -157,24 +158,24 @@
      */
     public void testGetPreviousWord() {
         // If one of the following cases breaks, the bigram suggestions won't work.
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mWord, "abc");
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc", mSpacingAndPunctuations, 2), PrevWordsInfo.BEGINNING_OF_SENTENCE);
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc. def", mSpacingAndPunctuations, 2), PrevWordsInfo.BEGINNING_OF_SENTENCE);
 
-        assertFalse(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertFalse(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mIsBeginningOfSentence);
-        assertTrue(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertTrue(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mIsBeginningOfSentence);
 
         // For n-gram
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def", mSpacingAndPunctuations, 1).mPrevWordsInfo[0].mWord, "def");
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def", mSpacingAndPunctuations, 1).mPrevWordsInfo[1].mWord, "abc");
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def", mSpacingAndPunctuations, 2).mPrevWordsInfo[1],
                 WordInfo.BEGINNING_OF_SENTENCE);
 
@@ -185,32 +186,32 @@
         // this function if needed - especially since it does not seem very
         // logical. These tests are just there to catch any unintentional
         // changes in the behavior of the RichInputConnection#getPreviousWord method.
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def ", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mWord, "abc");
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def.", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mWord, "abc");
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def .", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mWord, "def");
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc ", mSpacingAndPunctuations, 2), PrevWordsInfo.BEGINNING_OF_SENTENCE);
 
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def", mSpacingAndPunctuations, 1).mPrevWordsInfo[0].mWord, "def");
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def ", mSpacingAndPunctuations, 1).mPrevWordsInfo[0].mWord, "def");
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc 'def", mSpacingAndPunctuations, 1).mPrevWordsInfo[0].mWord, "'def");
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def.", mSpacingAndPunctuations, 1), PrevWordsInfo.BEGINNING_OF_SENTENCE);
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc def .", mSpacingAndPunctuations, 1), PrevWordsInfo.BEGINNING_OF_SENTENCE);
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc, def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO);
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc? def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO);
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc! def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO);
-        assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord(
+        assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord(
                 "abc 'def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO);
     }