diff --git a/res/layout-sw580dp-land/people_activity.xml b/res/layout-sw580dp-land/people_activity.xml
index 6e7133f..986ed4a 100644
--- a/res/layout-sw580dp-land/people_activity.xml
+++ b/res/layout-sw580dp-land/people_activity.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 
-<FrameLayout
+<view
+    class="com.android.contacts.widget.TransitionAnimationView"
+    android:id="@+id/people_view"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:ex="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -155,4 +157,4 @@
             android:paddingBottom="20dip" />
 
     </com.android.contacts.widget.InterpolatingLayout>
-</FrameLayout>
+</view>
diff --git a/res/layout-sw580dp/people_activity.xml b/res/layout-sw580dp/people_activity.xml
index eecf38a..0962f89 100644
--- a/res/layout-sw580dp/people_activity.xml
+++ b/res/layout-sw580dp/people_activity.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 
-<FrameLayout
+<view
+    class="com.android.contacts.widget.TransitionAnimationView"
+    android:id="@+id/people_view"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:ex="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -138,4 +140,4 @@
             android:paddingBottom="20dip" />
 
     </com.android.contacts.widget.InterpolatingLayout>
-</FrameLayout>
+</view>
diff --git a/res/layout-sw680dp-land/people_activity.xml b/res/layout-sw680dp-land/people_activity.xml
index d942796..25de5e7 100644
--- a/res/layout-sw680dp-land/people_activity.xml
+++ b/res/layout-sw680dp-land/people_activity.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 
-<FrameLayout
+<view
+    class="com.android.contacts.widget.TransitionAnimationView"
+    android:id="@+id/people_view"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:ex="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -163,4 +165,4 @@
             android:paddingBottom="20dip" />
 
     </com.android.contacts.widget.InterpolatingLayout>
-</FrameLayout>
+</view>
diff --git a/res/layout-sw680dp/people_activity.xml b/res/layout-sw680dp/people_activity.xml
index d6a59db..2a992f2 100644
--- a/res/layout-sw680dp/people_activity.xml
+++ b/res/layout-sw680dp/people_activity.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 
-<FrameLayout
+<view
+    class="com.android.contacts.widget.TransitionAnimationView"
+    android:id="@+id/people_view"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:ex="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -158,4 +160,4 @@
             android:paddingBottom="20dip" />
 
     </com.android.contacts.widget.InterpolatingLayout>
-</FrameLayout>
+</view>
diff --git a/res/layout/stream_item_row_images.xml b/res/layout/stream_item_row_images.xml
index a96e2d2..8620be9 100644
--- a/res/layout/stream_item_row_images.xml
+++ b/res/layout/stream_item_row_images.xml
@@ -41,6 +41,7 @@
         class="com.android.contacts.common.widget.ProportionalLayout"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/detail_update_section_between_items_padding"
         android:layout_weight="1"
         ex:ratio="1"
         ex:direction="widthToHeight">
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 70fb752..28d4e5a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Rangskik lys volgens"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Voornaam"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Van"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Sien kontakname as"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Voornaam eerste"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Van eerste"</string>
     <string name="take_photo" msgid="7496128293167402354">"Neem foto"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d1e8134..eb83296 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"ዝርዝር በ  ለይ"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"መጠሪያ ስም"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"የቤተሰብ ስም"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"የእውቂያ ስሞችን እንደ እይ"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"መጠሪያ ስም መጀመሪያ"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"የቤተሰብ መነሻስም"</string>
     <string name="take_photo" msgid="7496128293167402354">"ፎቶ አንሳ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2aa99c2..dbd91a3 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"تصنيف القائمة بحسب"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"الاسم الأول"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"اسم العائلة"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"كيفية عرض الأسماء"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"الاسم الأول أولاً"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"الاسم العائلة أولاً"</string>
     <string name="take_photo" msgid="7496128293167402354">"التقاط صورة"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 80490b5..7ee38a9 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Сартаваць спіс па"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Імя"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Прозвішча"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Паглядзець імёны кантактаў як"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Спачатку імя"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Спачатку прозвішча"</string>
     <string name="take_photo" msgid="7496128293167402354">"Зрабіць фота"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8d153d3..264b0c6 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Подреждане на списък по"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Собствено име"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Фамилия"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Преглед на имената на контакти като"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Първо собственото име"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Първо фамилията"</string>
     <string name="take_photo" msgid="7496128293167402354">"Снимане"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b61f673..b16fb8d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordena la llista per"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nom"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Cognom"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Visualitza els noms dels contactes com a"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nom primer"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Cognoms primer"</string>
     <string name="take_photo" msgid="7496128293167402354">"Fes una foto"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a4178e1..08540df 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Seřadit seznam podle"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Křestní jméno"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Příjmení"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Zobrazení jmen kontaktů"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nejprve křestní jméno"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nejprve příjmení"</string>
     <string name="take_photo" msgid="7496128293167402354">"Vyfotit"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 88cf4a1..ab7c011 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sorter liste efter"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Fornavn"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Efternavn"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Vis personers navne som"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Fornavn først"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Efternavn først"</string>
     <string name="take_photo" msgid="7496128293167402354">"Tag billede"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 88b45d7..838416f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Liste sortieren nach"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Vorname"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nachname"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Kontaktnamen-Anzeige:"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Vorname zuerst"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nachname zuerst"</string>
     <string name="take_photo" msgid="7496128293167402354">"Foto machen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f64513a..88cfea0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ταξινόμηση λίστας κατά"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Όνομα"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Επίθετο"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Προβολή ονομάτων επαφών ως"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Πρώτα το όνομα"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Πρώτα το επίθετο"</string>
     <string name="take_photo" msgid="7496128293167402354">"Λήψη φωτογραφίας"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 92c0fae..1d16373 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sort list by"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"First name"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Surname"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"View contact names as"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"First name first"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Surname first"</string>
     <string name="take_photo" msgid="7496128293167402354">"Take photo"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 67d7679..c70610c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordenar listas por"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nombre"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Apellido"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Mostrar contactos por"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nombre Apellido"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apellido Nombre"</string>
     <string name="take_photo" msgid="7496128293167402354">"Tomar foto"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 486bb96..a1ce593 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordenar lista por"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nombre"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Apellidos"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Ver nombres de contactos por"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nombre primero"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apellidos primero"</string>
     <string name="take_photo" msgid="7496128293167402354">"Hacer una foto"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 4ae0da6..dd337f2 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Loendi sortimisalus"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Eesnimi"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Perekonnanimi"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Kuva kontaktinimed:"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Eesnimi kõigepealt"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Perekonnanimi kõigepealt"</string>
     <string name="take_photo" msgid="7496128293167402354">"Tee foto"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a56f954..053a2ca 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"مرتب سازی لیست بر اساس"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"نام"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"نام خانوادگی"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"مشاهده نام‌های مخاطب به‌عنوان"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"ابتدا نام"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"ابتدا نام خانوادگی"</string>
     <string name="take_photo" msgid="7496128293167402354">"عکسبرداری"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index abbfd6e..98dd97c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Luettelon lajittelutapa"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Etunimi"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Sukunimi"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Näytä yhteystietojen nimet"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Etunimi ensin"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Sukunimi ensin"</string>
     <string name="take_photo" msgid="7496128293167402354">"Ota valokuva"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 14bf8d1..950966e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Trier la liste par"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Prénom"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nom"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Afficher les contacts par"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Le prénom en premier"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Le nom en premier"</string>
     <string name="take_photo" msgid="7496128293167402354">"Prendre une photo"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b86f29b..29a2d67 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"सूची को इसके अनुसार क्रमित करें"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"दिया गया नाम"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"उपनाम"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"संपर्क नामों को इस रूप में देखें"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"दिया गया नाम पहले"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"कुलनाम पहले"</string>
     <string name="take_photo" msgid="7496128293167402354">"फ़ोटो लें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3784671..48f3652 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Poredaj popis prema"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Ime"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Prezime"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Prikaži nazive kontakata kao"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najprije ime"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najprije prezime"</string>
     <string name="take_photo" msgid="7496128293167402354">"Snimi fotografiju"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bbe50af..57b78b9 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Lista rendezési elve:"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Utónév"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Vezetéknév"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Nevek megtekintése mint"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Utónév előre"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Vezetéknév elöl"</string>
     <string name="take_photo" msgid="7496128293167402354">"Fotó készítése"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4db099e..8c1450e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sortir daftar menurut"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nama depan"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nama keluarga"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Tampilkan nama kontak sebagai"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nama depan pertama"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nama keluarga pertama"</string>
     <string name="take_photo" msgid="7496128293167402354">"Ambil foto"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f422135..e09cf5e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordina elenco per"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nome"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Cognome"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Visualizza nomi contatti con"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Prima il nome"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Prima il cognome"</string>
     <string name="take_photo" msgid="7496128293167402354">"Scatta foto"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b67cfb4..25a3169 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"מיין רשימה לפי"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"שם פרטי"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"שם משפחה"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"הצג שמות אנשי קשר בתור"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"תחילה שם פרטי"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"שם משפחה תחילה"</string>
     <string name="take_photo" msgid="7496128293167402354">"צלם תמונה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 965bc92..7ad5260 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"並び替え順"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"名"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"姓"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"名前の表示形式"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"名が先"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓が先"</string>
     <string name="take_photo" msgid="7496128293167402354">"写真を撮影"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 258cf65..7660c94 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"목록 정렬 기준"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"이름"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"성"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"연락처 이름 표시 방법:"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"이름 먼저 표시"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"성 먼저 표시"</string>
     <string name="take_photo" msgid="7496128293167402354">"사진 찍기"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 9186d71..9e61549 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Rūšiuoti sąrašą pagal"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Suteiktas pavadinimas"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Pavardė"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Žiūrėti adresatų vardus kaip"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Pirmiausia suteiktas pavadinimas"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Pirmiausia pavardė"</string>
     <string name="take_photo" msgid="7496128293167402354">"Fotografuoti"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index fc56f6e..3916cdc 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Kārtot sarakstu pēc"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Vārds"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Uzvārds"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Kontaktpersonu vārdu attēlošana:"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Vispirms rādīt vārdu"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Vispirms rādīt uzvārdu"</string>
     <string name="take_photo" msgid="7496128293167402354">"Uzņemt fotoattēlu"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 51b5f29..4b5b989 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Isih senarai mengikut"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nama berian"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nama keluarga"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Lihat nama kenalan sebagai"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nama berian dahulu"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nama keluarga dahulu"</string>
     <string name="take_photo" msgid="7496128293167402354">"Ambil foto"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c8649a6..88b72f9 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sorter listen etter"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Fornavn"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Etternavn"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Vis kontaktnavn som"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Fornavn først"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Etternavn først"</string>
     <string name="take_photo" msgid="7496128293167402354">"Ta bilde"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 62bc8d1..d25733a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Lijst sorteren op"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Roepnaam"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Achternaam"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Contactnamen weergeven als"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Roepnaam eerst"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Achternaam eerst"</string>
     <string name="take_photo" msgid="7496128293167402354">"Foto maken"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2267ad2..0014568 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sortuj listę według"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Imię"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nazwisko"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Wyświetl nazwy kontaktów jako"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najpierw imię"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najpierw nazwisko"</string>
     <string name="take_photo" msgid="7496128293167402354">"Zrób zdjęcie"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2323c51..fc7d639 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordenar lista por"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nome próprio"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Apelido"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Visualizar nomes de contactos como"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nome próprio em primeiro lugar"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apelido em primeiro lugar"</string>
     <string name="take_photo" msgid="7496128293167402354">"Tirar fotografia"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 45ed4ca..4c16b8a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Classificar lista por"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nome"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Sobrenome"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Visualizar nomes de contato como"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nome primeiro"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Sobrenome primeiro"</string>
     <string name="take_photo" msgid="7496128293167402354">"Tirar foto"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 7242307..ba0f731 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -184,7 +184,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Zavrar la glista tenor"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Prenum"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Num da famiglia"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Mussar ils nums da contacts sco"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"L\'emprim il prenum"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"L\'emprim il num da famiglia"</string>
     <string name="take_photo" msgid="7496128293167402354">"Far ina foto"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5c32eda..48316e2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sortaţi lista după"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Prenume"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Numele de familie"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Vizualizaţi numele persoanei din agendă ca"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Întâi prenumele"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Întâi numele de familie"</string>
     <string name="take_photo" msgid="7496128293167402354">"Fotografiaţi"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6c2ec9d..228a4f9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Упорядочить контакты"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"По имени"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"По фамилии"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Показывать в контактах"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Сначала имя"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Сначала фамилию"</string>
     <string name="take_photo" msgid="7496128293167402354">"Сфотографировать"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3875589..b6edad3 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Zoradiť zoznam podľa"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Krstné meno"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Priezvisko"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Zobrazenie mien kontaktov"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najskôr krstné meno"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najskôr priezvisko"</string>
     <string name="take_photo" msgid="7496128293167402354">"Zaznamenať fotografiu"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8faaa58..63e8c28 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Razvrsti seznam po"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Ime"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Priimek"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Prikaži imena stikov kot"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najprej ime"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najprej priimek"</string>
     <string name="take_photo" msgid="7496128293167402354">"Posnemi fotografijo"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 56f3ff4..b15faeb 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Сортирај листу према"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Име"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Презиме"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Прикажи имена контаката као"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Најпре име"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Прво презиме"</string>
     <string name="take_photo" msgid="7496128293167402354">"Сними фотографију"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 114a8b8..eae6b76 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sortera lista efter"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Förnamn"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Efternamn"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Visa kontaktnamn som"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Förnamn först"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Efternamn först"</string>
     <string name="take_photo" msgid="7496128293167402354">"Ta en bild"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e19612a..00e0b8e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Panga orodha kwa"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Jina la kwanza"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Jila la familia"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Tazama majina ya anwani kama"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Jina ulilopewa kwanza"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Jina la familia kwanza"</string>
     <string name="take_photo" msgid="7496128293167402354">"Piga picha"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9fac1cd..246eaa6 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"เรียงรายการตาม"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"ชื่อ"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"นามสกุล"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"ดูชื่อของรายชื่อเป็น"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"ขึ้นต้นด้วยชื่อ"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"ขึ้นต้นด้วยนามสกุล"</string>
     <string name="take_photo" msgid="7496128293167402354">"ถ่ายภาพ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 70e611a..9a8606b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Pag-uri-uriin ang listahan ayon sa"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Pangalan"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Apelyido"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Tingnan ang mga pangalan ng contact bilang"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Pangalan muna"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apelyido muna"</string>
     <string name="take_photo" msgid="7496128293167402354">"Kumuha ng larawan"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 2c7e406..caf4b05 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Listeyi şu ölçüte göre sırala:"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Adı"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Soyadı"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Kişi adlarını görüntüleme şekli:"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Önce adı"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Önce soyadı"</string>
     <string name="take_photo" msgid="7496128293167402354">"Fotoğraf çek"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bf03d01..4e92bed 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Сорт. список за"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Ім\'я"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Прізвище"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Див. імена контактів як"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Спочатку ім\'я"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Спочатку прізвище"</string>
     <string name="take_photo" msgid="7496128293167402354">"Зробити фото"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3adbe43..40b413d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sắp xếp danh sách theo"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Tên"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Họ"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Xem tên liên hệ dưới dạng"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Tên trước tiên"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Họ trước tiên"</string>
     <string name="take_photo" msgid="7496128293167402354">"Chụp ảnh"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0ba2a41..1cc326c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"列表排序依据"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"名字"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"姓氏"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"联系人姓名的显示方式"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"名字在前"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓氏在前"</string>
     <string name="take_photo" msgid="7496128293167402354">"拍照"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1a90e03..d730653 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"清單排序依據"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"名字"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"姓氏"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"聯絡人姓名顯示方式"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"名字在前"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓氏在前"</string>
     <string name="take_photo" msgid="7496128293167402354">"拍照"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1cc058d..d8ff0ab 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -138,7 +138,8 @@
     <string name="display_options_sort_list_by" msgid="6080091755852211076">"Hlunga uhlu nge"</string>
     <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Igama elinikeziwe"</string>
     <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Igama lomkhaya"</string>
-    <string name="display_options_view_names_as" msgid="18022868169627979">"Buka amagama othintana nabo njenge"</string>
+    <!-- no translation found for display_options_view_names_as (4386932036180428374) -->
+    <skip />
     <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Igama elinikeziwe kuqala"</string>
     <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Igama lomkhaya kuqala"</string>
     <string name="take_photo" msgid="7496128293167402354">"Thatha isithombe"</string>
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 1b663f0..e379767 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -109,6 +109,8 @@
     /** Shows a toogle button for hiding/showing updates. Don't submit with true */
     private static final boolean DEBUG_TRANSITIONS = false;
 
+    private static final int TAB_FADE_IN_DURATION = 500;
+
     private static final String ENABLE_DEBUG_OPTIONS_HIDDEN_CODE = "debug debug!";
 
     // These values needs to start at 2. See {@link ContactEntryListFragment}.
@@ -156,6 +158,7 @@
 
     private View mFavoritesView;
     private View mBrowserView;
+    private TransitionAnimationView mPeopleActivityView;
     private TransitionAnimationView mContactDetailsView;
     private TransitionAnimationView mGroupDetailsView;
 
@@ -390,6 +393,7 @@
             // Prepare 2-pane only fragments/views...
 
             // Container views for fragments
+            mPeopleActivityView = getView(R.id.people_view);
             mFavoritesView = getView(R.id.favorites_view);
             mContactDetailsView = getView(R.id.contact_details_view);
             mGroupDetailsView = getView(R.id.group_details_view);
@@ -609,7 +613,7 @@
         // If we are switching from one group to another, do a cross-fade
         if (mGroupDetailFragment != null && mGroupDetailFragment.getGroupUri() != null &&
                 !UriUtils.areEqual(mGroupDetailFragment.getGroupUri(), groupUri)) {
-            mGroupDetailsView.startMaskTransition(false);
+            mGroupDetailsView.startMaskTransition(false, -1);
         }
         mGroupDetailFragment.loadGroup(groupUri);
         invalidateOptionsMenuIfNeeded();
@@ -688,6 +692,7 @@
         if (mActionBarAdapter.isSearchMode()) {
             tab = TabState.ALL;
         }
+
         switch (tab) {
             case TabState.FAVORITES:
                 mFavoritesView.setVisibility(View.VISIBLE);
@@ -709,6 +714,7 @@
                 mGroupDetailsView.setVisibility(View.GONE);
                 break;
         }
+        mPeopleActivityView.startMaskTransition(false, TAB_FADE_IN_DURATION);
         FragmentManager fragmentManager = getFragmentManager();
         FragmentTransaction ft = fragmentManager.beginTransaction();
 
diff --git a/src/com/android/contacts/detail/ContactDetailLayoutController.java b/src/com/android/contacts/detail/ContactDetailLayoutController.java
index 1e1ebd3..3c359ba 100644
--- a/src/com/android/contacts/detail/ContactDetailLayoutController.java
+++ b/src/com/android/contacts/detail/ContactDetailLayoutController.java
@@ -290,7 +290,7 @@
         if (PhoneCapabilityTester.isUsingTwoPanes(mActivity)) {
             // Tablet: If we already showed data before, we want to cross-fade from screen to screen
             if (contactWasLoaded && mTransitionAnimationView != null && isDifferentContact) {
-                mTransitionAnimationView.startMaskTransition(mContactData == null);
+                mTransitionAnimationView.startMaskTransition(mContactData == null, -1);
             }
         } else {
             // Small screen: We are on our own screen. Fade the data in, but only the first time
@@ -365,7 +365,7 @@
                     // This is screen is very hard to animate properly, because there is such a hard
                     // cut from the regular version. A proper animation would have to reflow text
                     // and move things around. Doing a simple cross-fade instead.
-                    mTransitionAnimationView.startMaskTransition(false);
+                    mTransitionAnimationView.startMaskTransition(false, -1);
                 }
 
                 // Set the contact data (hide the static photo because the photo will already be in
diff --git a/src/com/android/contacts/widget/TransitionAnimationView.java b/src/com/android/contacts/widget/TransitionAnimationView.java
index 28d728b..2e277a9 100644
--- a/src/com/android/contacts/widget/TransitionAnimationView.java
+++ b/src/com/android/contacts/widget/TransitionAnimationView.java
@@ -63,25 +63,30 @@
     }
 
     /**
-     * Starts the transition of showing or hiding the mask.
-     * If showMask is true, the mask will be set to be invisible then fade into hide the other
-     * views in this container.  If showMask is false, the mask will be set to be hide other views
-     * initially.  Then, the other views in this container will be revealed.
+     * Starts the transition of showing or hiding the mask. To the user, the view will appear to
+     * either fade in or out of view.
+     *
+     * @param showMask If true, the mask the mask will be set to be invisible then fade into hide
+     * the other views in this container. If false, the the mask will be set to be hide other
+     * views initially.  Then, the other views in this container will be revealed.
+     * @param duration The duration the animation should last for. If -1, the system default(300)
+     * is used.
      */
-    public void startMaskTransition(boolean showMask) {
+    public void startMaskTransition(boolean showMask, int duration) {
         // Stop any animation that may still be running.
         if (mAnimator != null && mAnimator.isRunning()) {
             mAnimator.end();
         }
-
         mMaskingView.setVisibility(View.VISIBLE);
         if (showMask) {
             mAnimator = ObjectAnimator.ofFloat(mMaskingView, View.ALPHA, 0.0f, 1.0f);
-            mAnimator.start();
         } else {
             // asked to hide the view
             mAnimator = ObjectAnimator.ofFloat(mMaskingView, View.ALPHA, 1.0f, 0.0f);
-            mAnimator.start();
         }
+        if (duration != -1) {
+            mAnimator.setDuration(duration);
+        }
+        mAnimator.start();
     }
 }