diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e974863..b2e9df9 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-eu/strings.xml b/res/values-eu/strings.xml
index f1f48d5..44da5a3 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -273,7 +273,7 @@
     <string name="sms_assistant" msgid="245045451580096547">"Bidali testu-mezua <xliff:g id="ASSISTANT">%s</xliff:g> zenbakira"</string>
     <string name="sms_mms" msgid="7395133080765833725">"Bidali testu-mezua MMS zenbakira"</string>
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (bidali SMS mezua)"</string>
-    <string name="description_video_call" msgid="4956825008907720371">"Egin bideo-deia"</string>
+    <string name="description_video_call" msgid="4956825008907720371">"Egin bideodeia"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Sarri erabilitako kontaktuak garbitu?"</string>
     <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Kontaktuak eta Telefonoa aplikazioetako maiz erabilitako kontaktuen zerrenda garbituko duzu. Beraz, berriro ikasi beharko dituzte helbideen hobespenak posta elektronikoaren aplikazioek."</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"Sarri erabilitako kontaktuak garbitzen…"</string>
@@ -463,7 +463,7 @@
     <string name="url_open_error_toast" msgid="4885855620824048385">"Ezin izan da ireki URLa."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> hautatu da"</string>
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"Ez da hautatu <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
-    <string name="description_search_video_call" msgid="1768558141309418755">"Egin bideo-deia"</string>
+    <string name="description_search_video_call" msgid="1768558141309418755">"Egin bideodeia"</string>
     <string name="description_delete_contact" msgid="8110643050235441400">"Ezabatu"</string>
     <string name="description_no_name_header" msgid="8596201864512339003">"Etenpuntuak"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"Lasterbidea desgaitu egin da"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 045d1d8..e70f763 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -221,8 +221,8 @@
     <string name="editor_delete_view_description_short" msgid="6471032197042328181">"Poista <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
     <string name="menu_assistant" msgid="3980364519724237934">"Ehdotukset"</string>
     <string name="menu_assistant_new_badge" msgid="1992049406019853898">"Uusi"</string>
-    <string name="navigation_drawer_open" msgid="3428713515765555712">"Avaa navigoinnin vetopaneeli"</string>
-    <string name="navigation_drawer_close" msgid="3052989100471689722">"Sulje navigoinnin vetopaneeli"</string>
+    <string name="navigation_drawer_open" msgid="3428713515765555712">"Avaa navigointipaneeli"</string>
+    <string name="navigation_drawer_close" msgid="3052989100471689722">"Sulje navigointipaneeli"</string>
     <string name="navigation_drawer_label" msgid="8391863484838783638">"Tunniste <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
     <string name="menu_title_groups" msgid="3722199658759568221">"Tunnisteet"</string>
     <string name="menu_title_filters" msgid="349866121417914494">"Tilit"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b93a153..423beb9 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -159,7 +159,7 @@
     <string name="non_phone_close" msgid="2792373584950696532">"סגור"</string>
     <string name="date_year_toggle" msgid="8930759990426623823">"ציין שנה"</string>
     <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"הוספת חשבון"</string>
-    <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"ייבא"</string>
+    <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"ייבוא"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"צור חדשה…"</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"למחוק את התווית \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\"? (אנשי הקשר המסומנים בתווית לא יימחקו)."</string>
     <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"הקלד שם של איש קשר לפני קישורו לאחר."</string>
@@ -468,7 +468,7 @@
     <string name="description_no_name_header" msgid="8596201864512339003">"שלוש נקודות"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"קיצור הדרך הזה הושבת"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="8331735243566193974">"איש הקשר הוסר"</string>
-    <string name="sim_import_button_text" msgid="2845608246304396009">"ייבא"</string>
+    <string name="sim_import_button_text" msgid="2845608246304396009">"ייבוא"</string>
     <string name="sim_import_title_none_selected" msgid="3527680774575468781">"בחירת אנשי קשר"</string>
     <string name="sim_import_empty_message" msgid="7238368542566545854">"‏אין אף איש קשר בכרטיס ה-SIM"</string>
     <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"איש הקשר כבר קיים ברשימה"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 65b5336..0f5a481 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -88,7 +88,7 @@
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> Башкы экранга кошулду."</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"Түзмөктө бир да сүрөт жок."</string>
     <string name="attach_photo_dialog_title" msgid="7948754072673745235">"Байланыштын сүрөтү"</string>
-    <string name="customLabelPickerTitle" msgid="816694850254307154">"Ыңгайлаштырылган энбелгинин аталышы"</string>
+    <string name="customLabelPickerTitle" msgid="816694850254307154">"Аталышы"</string>
     <string name="removePhoto" msgid="1190099414600730001">"Сүрөттү алып салуу"</string>
     <string name="noContacts" msgid="3030512741779213810">"Байланыштар тизмеңиз бош"</string>
     <string name="emptyGroup" msgid="8598261660865081152">"Бул энбелги коюлган бир дагы байланыш жок"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 573360b..02e4bc6 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -120,7 +120,7 @@
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"കോൺടാക്റ്റുകളൊന്നുമില്ല"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"കോൺടാക്റ്റുകളിലേക്ക് \"<xliff:g id="EMAIL">%s</xliff:g>\" ചേർക്കണോ?"</string>
     <string name="search_settings_description" msgid="5630675648560839920">"നിങ്ങളുടെ കോൺടാക്റ്റുകളുടെ പേരുകൾ"</string>
-    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"മുമ്പത്തെ സ്‌ക്രീനിലേക്ക് മടങ്ങാൻ ക്ലിക്കുചെയ്യുക"</string>
+    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"മുമ്പത്തെ സ്‌ക്രീനിലേക്ക് മടങ്ങാൻ ക്ലിക്ക് ചെയ്യുക"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"ഫോണ്‍ നമ്പര്‍ ചേര്‍ക്കുക"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"ഇമെയില്‍‌ ചേര്‍‌ക്കുക"</string>
     <string name="missing_app" msgid="5674389915738964148">"ഈ പ്രവർത്തനം കൈകാര്യം ചെയ്യാൻ അപ്ലിക്കേഷനുകളൊന്നും കണ്ടെത്തിയില്ല."</string>
@@ -387,7 +387,7 @@
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"ഫോർമാറ്റിനെ പിന്തുണയ്‌ക്കില്ല."</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g> എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5463125514187187782">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി, കോൺടാക്റ്റുകൾ പങ്കിടുന്നതിന് അറിയിപ്പിൽ ക്ലിക്കുചെയ്യുക."</string>
+    <string name="exporting_vcard_finished_toast" msgid="5463125514187187782">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി, കോൺടാക്റ്റുകൾ പങ്കിടുന്നതിന് അറിയിപ്പിൽ ക്ലിക്ക് ചെയ്യുക."</string>
     <string name="touch_to_share_contacts" msgid="7678194978416052577">"കോൺടാക്റ്റുകൾ പങ്കിടാൻ ടാപ്പുചെയ്യുക."</string>
     <string name="exporting_vcard_canceled_title" msgid="1287529222628052526">"<xliff:g id="FILENAME">%s</xliff:g> എക്‌സ്‌പോർട്ടുചെയ്യൽ റദ്ദാക്കി."</string>
     <string name="exporting_contact_list_title" msgid="6599904516394311592">"കോൺടാക്റ്റ് ഡാറ്റ എക്‌സ്‌പോർട്ടുചെയ്യുന്നു"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index b4ba64f..439e4b2 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -442,7 +442,7 @@
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"आवडते"</string>
     <string name="menu_import" msgid="2206768098740726906">"इंपोर्ट करा"</string>
     <string name="menu_export" msgid="1217402092617629429">"एक्सपोर्ट"</string>
-    <string name="menu_blocked_numbers" msgid="7064680515202657609">"अवरोधित केलेले नंबर"</string>
+    <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>
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