diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8f754c2..a5119fa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -55,7 +55,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <!-- Required in P to run Service.startForeground() -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
+    <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-feature
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f939d4b..2eaabd1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -486,7 +486,7 @@
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
     <string name="show_more_content_description" msgid="6298277298495491712">"Mostra\'n més"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"Importació de la targeta SIM completada"</string>
-    <string name="importing_sim_failed_title" msgid="1046154274170241788">"Ha fallat la importació"</string>
+    <string name="importing_sim_failed_title" msgid="1046154274170241788">"La importació ha fallat"</string>
     <string name="importing_sim_failed_message" msgid="55568522164349044">"No s\'han pogut importar els contactes de la targeta SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="7647907413920018595">"S\'estan important els contactes de la SIM"</string>
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Notificacions"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8cbd6a0..4996594 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -65,9 +65,9 @@
     <string name="contacts_deleted_one_named_toast" msgid="2707266264779781309">"<xliff:g id="NAME">%1$s</xliff:g> eliminato"</string>
     <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"<xliff:g id="NAME_0">%1$s</xliff:g> e <xliff:g id="NAME_1">%2$s</xliff:g> eliminati"</string>
     <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>… eliminati"</string>
-    <string name="contacts_deleted_toast" msgid="3185825083067357305">"{count,plural, =1{Contatto eliminato}one{Contatto eliminato}other{Contatti eliminati}}"</string>
-    <string name="contacts_count" msgid="92227640680327707">"{count,plural, =1{# contatto}one{# contatto}other{# contatti}}"</string>
-    <string name="contacts_count_with_account" msgid="3921405666045433256">"{count,plural, =1{# contatto · {account}}one{# contatto · {account}}other{# contatti · {account}}}"</string>
+    <string name="contacts_deleted_toast" msgid="3185825083067357305">"{count,plural, =1{Contatto eliminato}other{Contatti eliminati}}"</string>
+    <string name="contacts_count" msgid="92227640680327707">"{count,plural, =1{# contatto}other{# contatti}}"</string>
+    <string name="contacts_count_with_account" msgid="3921405666045433256">"{count,plural, =1{# contatto · {account}}other{# contatti · {account}}}"</string>
     <string name="title_from_google" msgid="2554633992366572820">"Di Google"</string>
     <string name="title_from_other_accounts" msgid="7813596336566711843">"Da <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="menu_set_ring_tone" msgid="8876328286439724181">"Imposta suoneria"</string>
@@ -127,7 +127,7 @@
     <string name="menu_share" msgid="6343022811796001773">"Condividi"</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"Aggiungi ai contatti"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Aggiungi"</string>
-    <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{Condividi contatto tramite}one{Condividi contatto tramite}other{Condividi contatti tramite}}"</string>
+    <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{Condividi contatto tramite}other{Condividi contatti tramite}}"</string>
     <string name="dialog_new_group_account" msgid="4326402875327788728">"Scegli account"</string>
     <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"Crea etichetta"</string>
     <string name="group_name_dialog_update_title" msgid="3955919589366745101">"Rinomina etichetta"</string>
@@ -368,8 +368,8 @@
     <string name="dialog_new_contact_account" msgid="5652018124788855057">"Salva i contatti importati in:"</string>
     <string name="import_from_sim" msgid="7825280799813847991">"Scheda SIM"</string>
     <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_sim_secondary_contact_count_fmt" msgid="4406774701661271748">"{count,plural, =1{# contatto}one{# contatto}other{# contatti}}"</string>
-    <string name="import_from_sim_secondary_template" msgid="7574306746844258362">"{count,plural, =1{# contatto • <xliff:g id="PHONE_NUMBER_0">^1</xliff:g>}one{# contatto • <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}other{# contatti • <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}}"</string>
+    <string name="import_from_sim_secondary_contact_count_fmt" msgid="4406774701661271748">"{count,plural, =1{# contatto}other{# contatti}}"</string>
+    <string name="import_from_sim_secondary_template" msgid="7574306746844258362">"{count,plural, =1{# contatto • <xliff:g id="PHONE_NUMBER_0">^1</xliff:g>}other{# contatti • <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}}"</string>
     <string name="import_from_vcf_file" msgid="6776403212804361301">"File .vcf"</string>
     <string name="nothing_to_import_message" msgid="2594519620375509783">"Niente da importare"</string>
     <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"Importare i contatti da vCard?"</string>
@@ -472,7 +472,7 @@
     <string name="sim_import_title_none_selected" msgid="3527680774575468781">"Seleziona contatti"</string>
     <string name="sim_import_empty_message" msgid="7238368542566545854">"Nessun contatto presente nella SIM"</string>
     <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"Contatto già esistente nell\'elenco"</string>
-    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{# contatto importato dalla SIM}one{# contatto importato dalla SIM}other{# contatti importati dalla SIM}}"</string>
+    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{# contatto importato dalla SIM}other{# contatti importati dalla SIM}}"</string>
     <string name="sim_import_failed_toast" msgid="358117391138073786">"Impossibile importare i contatti della SIM"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"Importa da SIM"</string>
     <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Annulla"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index c02fc3c..1f1cf0f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -333,7 +333,7 @@
     <string name="postal_country" msgid="6642804283917549861">"País"</string>
     <string name="map_home" msgid="2169053372466501148">"Ver endereço residencial"</string>
     <string name="map_work" msgid="8296916987749726461">"Ver endereço do trabalho"</string>
-    <string name="map_other" msgid="4009931029322619674">"Visualizar endereço"</string>
+    <string name="map_other" msgid="4009931029322619674">"Ver endereço"</string>
     <string name="map_custom" msgid="7797812861927817335">"Ver endereço de <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
     <string name="chat_aim" msgid="2044861410748519265">"Bater papo usando o AIM"</string>
     <string name="chat_msn" msgid="4733206223124506247">"Bater papo usando o Windows Live"</string>
@@ -413,7 +413,7 @@
     <string name="caching_vcard_title" msgid="6333926052524937628">"Armazenando em cache"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"Exportar p/ arquivo .vcf"</string>
-    <string name="display_options_sort_list_by" msgid="4333658089057400431">"Classificar por"</string>
+    <string name="display_options_sort_list_by" msgid="4333658089057400431">"Ordenar por"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome fonético"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Mostrar sempre"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Ocultar se vazio"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 72e26ad..f44df89 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -65,9 +65,9 @@
     <string name="contacts_deleted_one_named_toast" msgid="2707266264779781309">"Contacto <xliff:g id="NAME">%1$s</xliff:g> eliminado"</string>
     <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"Contactos <xliff:g id="NAME_0">%1$s</xliff:g> e <xliff:g id="NAME_1">%2$s</xliff:g> eliminados"</string>
     <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>… foram eliminados"</string>
-    <string name="contacts_deleted_toast" msgid="3185825083067357305">"{count,plural, =1{Contacto eliminado}one{Contacto(s) eliminado(s)}other{Contactos eliminados}}"</string>
-    <string name="contacts_count" msgid="92227640680327707">"{count,plural, =1{# contacto}one{# contacto(s)}other{# contactos}}"</string>
-    <string name="contacts_count_with_account" msgid="3921405666045433256">"{count,plural, =1{# contacto · {account}}one{# contacto(s) · {account}}other{# contactos · {account}}}"</string>
+    <string name="contacts_deleted_toast" msgid="3185825083067357305">"{count,plural, =1{Contacto eliminado}other{Contactos eliminados}}"</string>
+    <string name="contacts_count" msgid="92227640680327707">"{count,plural, =1{# contacto}other{# contactos}}"</string>
+    <string name="contacts_count_with_account" msgid="3921405666045433256">"{count,plural, =1{# contacto · {account}}other{# contactos · {account}}}"</string>
     <string name="title_from_google" msgid="2554633992366572820">"Da Google"</string>
     <string name="title_from_other_accounts" msgid="7813596336566711843">"Da conta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="menu_set_ring_tone" msgid="8876328286439724181">"Definir toque"</string>
@@ -127,7 +127,7 @@
     <string name="menu_share" msgid="6343022811796001773">"Partilhar"</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"Adicionar aos contactos"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Adicionar"</string>
-    <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{Partilhar contacto através de}one{Partilhar contacto(s) através de}other{Partilhar contactos através de}}"</string>
+    <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{Partilhar contacto através de}other{Partilhar contactos através de}}"</string>
     <string name="dialog_new_group_account" msgid="4326402875327788728">"Selecionar conta"</string>
     <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"Criar etiqueta"</string>
     <string name="group_name_dialog_update_title" msgid="3955919589366745101">"Mudar o nome da etiqueta"</string>
@@ -368,8 +368,8 @@
     <string name="dialog_new_contact_account" msgid="5652018124788855057">"Guardar contactos importados em:"</string>
     <string name="import_from_sim" msgid="7825280799813847991">"Cartão SIM"</string>
     <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_sim_secondary_contact_count_fmt" msgid="4406774701661271748">"{count,plural, =1{# contacto}one{# contacto(s)}other{# contactos}}"</string>
-    <string name="import_from_sim_secondary_template" msgid="7574306746844258362">"{count,plural, =1{# contacto • <xliff:g id="PHONE_NUMBER_0">^1</xliff:g>}one{# contacto(s) • <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}other{# contactos • <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}}"</string>
+    <string name="import_from_sim_secondary_contact_count_fmt" msgid="4406774701661271748">"{count,plural, =1{# contacto}other{# contactos}}"</string>
+    <string name="import_from_sim_secondary_template" msgid="7574306746844258362">"{count,plural, =1{# contacto • <xliff:g id="PHONE_NUMBER_0">^1</xliff:g>}other{# contactos • <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}}"</string>
     <string name="import_from_vcf_file" msgid="6776403212804361301">"Ficheiro .vcf"</string>
     <string name="nothing_to_import_message" msgid="2594519620375509783">"Nada para importar"</string>
     <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"Pretende importar contactos do vCard?"</string>
@@ -472,7 +472,7 @@
     <string name="sim_import_title_none_selected" msgid="3527680774575468781">"Selecionar contactos"</string>
     <string name="sim_import_empty_message" msgid="7238368542566545854">"Sem contactos no cartão SIM"</string>
     <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"O contacto já existe na sua lista"</string>
-    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{# contacto do SIM importado}one{# contacto(s) do SIM importado(s)}other{# contactos do SIM importados}}"</string>
+    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{# contacto do SIM importado}other{# contactos do SIM importados}}"</string>
     <string name="sim_import_failed_toast" msgid="358117391138073786">"Ocorreu uma falha ao importar os contactos do cartão SIM"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"Importar do cartão SIM"</string>
     <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Cancelar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c02fc3c..1f1cf0f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -333,7 +333,7 @@
     <string name="postal_country" msgid="6642804283917549861">"País"</string>
     <string name="map_home" msgid="2169053372466501148">"Ver endereço residencial"</string>
     <string name="map_work" msgid="8296916987749726461">"Ver endereço do trabalho"</string>
-    <string name="map_other" msgid="4009931029322619674">"Visualizar endereço"</string>
+    <string name="map_other" msgid="4009931029322619674">"Ver endereço"</string>
     <string name="map_custom" msgid="7797812861927817335">"Ver endereço de <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
     <string name="chat_aim" msgid="2044861410748519265">"Bater papo usando o AIM"</string>
     <string name="chat_msn" msgid="4733206223124506247">"Bater papo usando o Windows Live"</string>
@@ -413,7 +413,7 @@
     <string name="caching_vcard_title" msgid="6333926052524937628">"Armazenando em cache"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"Exportar p/ arquivo .vcf"</string>
-    <string name="display_options_sort_list_by" msgid="4333658089057400431">"Classificar por"</string>
+    <string name="display_options_sort_list_by" msgid="4333658089057400431">"Ordenar por"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome fonético"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Mostrar sempre"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Ocultar se vazio"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1183589..7ed5315 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -124,7 +124,7 @@
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Shto një numër telefoni"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"Shto një email"</string>
     <string name="missing_app" msgid="5674389915738964148">"Nuk u gjet asnjë aplikacion për të menaxhuar këtë veprim"</string>
-    <string name="menu_share" msgid="6343022811796001773">"Shpërnda"</string>
+    <string name="menu_share" msgid="6343022811796001773">"Shpërndaj"</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"Shto te kontaktet"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Shto"</string>
     <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{Ndaje kontaktin nëpërmjet}other{Ndaji kontaktet nëpërmjet}}"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 028ea26..46184f8 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -104,8 +104,8 @@
     <string name="contactPhotoSavedErrorToast" msgid="8568460180541397272">"కాంటాక్ట్ ఫోటో మార్పులను సేవ్ చేయలేకపోయింది"</string>
     <string name="groupLoadErrorToast" msgid="4141488223976370583">"లేబుల్‌ను లోడ్ చేయడంలో విఫలమైంది"</string>
     <string name="groupDeletedToast" msgid="7774363940327847515">"లేబుల్ తొలగించబడింది"</string>
-    <string name="groupCreatedToast" msgid="1685148819468403239">"లేబుల్ సృష్టించబడింది"</string>
-    <string name="groupCreateFailedToast" msgid="1836425392831964024">"లేబుల్‌ను సృష్టించడం సాధ్యపడదు"</string>
+    <string name="groupCreatedToast" msgid="1685148819468403239">"లేబుల్ క్రియేట్ చేయబడింది"</string>
+    <string name="groupCreateFailedToast" msgid="1836425392831964024">"లేబుల్‌ను క్రియేట్ చేయడం సాధ్యపడదు"</string>
     <string name="groupUpdatedToast" msgid="3381549467345607379">"లేబుల్ నవీకరించబడింది"</string>
     <string name="groupMembersRemovedToast" msgid="8019566066934628011">"లేబుల్ నుండి తీసివేయబడ్డాయి"</string>
     <string name="groupMembersAddedToast" msgid="1939782548900157287">"లేబుల్‌కు జోడించబడింది/జోడించబడ్డాయి"</string>
@@ -355,7 +355,7 @@
     <string name="announce_collapsed_fields" msgid="7611318715383228182">"కుదించబడింది"</string>
     <string name="list_filter_all_accounts" msgid="6173785387972096770">"అన్ని కాంటాక్ట్‌లు"</string>
     <string name="list_filter_all_starred" msgid="2582865760150432568">"నక్షత్రం గుర్తు ఉన్నవి"</string>
-    <string name="list_filter_customize" msgid="2368900508906139537">"అనుకూలీకరించు"</string>
+    <string name="list_filter_customize" msgid="2368900508906139537">"అనుకూలంగా మార్చండి"</string>
     <string name="list_filter_single" msgid="6003845379327432129">"కాంటాక్ట్"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"అన్ని ఇతర కాంటాక్ట్‌లు"</string>
     <string name="display_all_contacts" msgid="1281067776483704512">"అన్ని కాంటాక్ట్‌లు"</string>
@@ -445,7 +445,7 @@
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"బ్లాక్ చేయబడిన నంబర్‌లు"</string>
     <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> ద్వారా"</string>
     <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="SOURCE">%2$s</xliff:g> ద్వారా <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="action_menu_back_from_search" msgid="683765774264585732">"శోధించడం ఆపివేస్తుంది"</string>
+    <string name="action_menu_back_from_search" msgid="683765774264585732">"సెర్చ్ చేయడం ఆపివేస్తుంది"</string>
     <string name="description_clear_search" msgid="1852934085825794095">"సెర్చ్‌ను క్లియర్ చేయండి"</string>
     <string name="select_account_dialog_title" msgid="5047523441152129207">"ఖాతా"</string>
     <string name="set_default_account" msgid="9194321110211682396">"కాల్స్‌ల కోసం ఎప్పుడూ ఇది ఉపయోగించు"</string>
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index 74a0df6..2af25f8 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -314,6 +314,8 @@
     public void onCreate(Bundle savedState) {
         super.onCreate(savedState);
 
+        getWindow().setHideOverlayWindows(true);
+
         RequestPermissionsActivity.startPermissionActivityIfNeeded(this);
 
         final Intent intent = getIntent();
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 2057c9d..9273c61 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -107,8 +107,7 @@
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
 
-        getWindow().addSystemFlags(android.view.WindowManager.LayoutParams
-            .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+        getWindow().setHideOverlayWindows(true);
 
         RequestPermissionsActivity.startPermissionActivityIfNeeded(this);
 
diff --git a/src/com/android/contacts/dialog/CallSubjectDialog.java b/src/com/android/contacts/dialog/CallSubjectDialog.java
index 036a0f3..ffce0f5 100644
--- a/src/com/android/contacts/dialog/CallSubjectDialog.java
+++ b/src/com/android/contacts/dialog/CallSubjectDialog.java
@@ -274,6 +274,7 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getWindow().setHideOverlayWindows(true);
         mAnimationDuration = getResources().getInteger(R.integer.call_subject_animation_duration);
         mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         mPhotoSize = getResources().getDimensionPixelSize(
diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
index 38367c4..6ddb8fa 100644
--- a/src/com/android/contacts/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -546,8 +546,7 @@
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
-        getWindow().addSystemFlags(android.view.WindowManager.LayoutParams
-            .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+        getWindow().setHideOverlayWindows(true);
 
         Uri sourceUri = getIntent().getData();
 
diff --git a/src/com/android/contacts/vcard/SelectAccountActivity.java b/src/com/android/contacts/vcard/SelectAccountActivity.java
index eb13e50..8ead5fa 100644
--- a/src/com/android/contacts/vcard/SelectAccountActivity.java
+++ b/src/com/android/contacts/vcard/SelectAccountActivity.java
@@ -52,8 +52,7 @@
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
-        getWindow().addSystemFlags(android.view.WindowManager.LayoutParams
-            .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+        getWindow().setHideOverlayWindows(true);
 
         // There's three possibilities:
         // - more than one accounts -> ask the user