Merge "Ensure the intro view is always the top view in the draglayer if it is present" into ub-now-mister-ugly
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index e649f48..3d337db 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Laai tans af…"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installeer tans…"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Onbekend"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Nie teruggestel nie"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f0ff9c8..489164c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"በማውረድ ላይ"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"በመጫን ላይ"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"የማይታወቅ"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"ወደነበረበት አልተመለሰም"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 881edf6..90eae74 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"جارٍ التنزيل"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"جارٍ التثبيت"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"غير معروفة"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"استعادة مخفقة"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index ba256ed..198cd18 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Изтегля се"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Инсталира се"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Няма информация"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Не е възстановено"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 47f01b5..f2229df 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"S\'està baixant"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Instal·lant"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconegut"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"No instal·lat"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 08f3906..6870f89 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Stahování"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Instalace"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Neznámé"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Nebylo obnoveno"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index bd6927b..f0ff7dc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Downloader"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installerer"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Ukendt"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Ikke gendannet"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bde6011..62e5266 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Download läuft"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installation"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Unbekannt"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Nicht wiederhergestellt"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6ff7f50..66cea00 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Λήψη "</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Εγκατάσταση"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Άγνωστο"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Δεν ανακτήθηκε"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 35b8963..eed1f80 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Downloading"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installing"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Unknown"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Not restored"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 35b8963..eed1f80 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Downloading"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installing"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Unknown"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Not restored"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index db421a1..b325c35 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Descargando"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Instalando"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconocido"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"No restaurado"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c33749b..3efdf9b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Descargando"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Instalando"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconocido"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"No restaurado"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index ffac2c3..73e4779 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Allalaadimine"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installimine"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Teadmata"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Ei taastatud"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 5a9e54b..d5e271b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"در حال دانلود"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"در حال نصب"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"نامشخص"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"بازیابی نشد"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0c593f5..c6ffdf6 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Ladataan"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Asennetaan"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Tuntematon"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Ei palautettu"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 2d49ede..0c71823 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Téléchargement..."</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installation…"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Inconnu"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Non restauré"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2710f0a..41ea546 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Téléchargement…"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installation…"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Inconnu"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Non restauré"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 2d9e292..d5e4074 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"डाउनलोड हो रहा है"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"इंस्टॉल हो रहा है"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"पुन:स्थापित नहीं हुआ"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 0149ecb..8116ba4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Preuzimanje"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Instaliranje"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Nepoznato"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Nije vraćeno"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5863112..59fc6e1 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Letöltés alatt"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Települ"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Ismeretlen"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Nincs visszaállítva"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 873bdcc..d02d48e 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Ներբեռնվում է"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Տեղադրվում է"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Անհայտ է"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Չի վերականգնվել"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 153ac72..ba85886 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Mengunduh"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Memasang"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Tidak dikenal"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Tak dipulihkan"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index fbdb56b..0d3bcc4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Download..."</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installazione..."</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Sconosciuto"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Non ripristinato"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 3751de7..cdfaf04 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"מוריד"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"מתקין"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"לא ידוע"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"לא שוחזרה"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ad1aaf9..e3ec47d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"ダウンロード中"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"インストール中"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"復元失敗"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 436e010..de701ca 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"ჩამოტვირთვა..."</string>
     <string name="package_state_installing" msgid="7588193972189849870">"ინსტალაცია..."</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"უცნობი"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"არ აღდგა"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 28b9a25..a5b53be 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"​ទាញ​យក"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"ដំឡើង"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"មិន​ស្គាល់"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"មិនបាន​​ស្តា​រ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 52bc2cb..f8a06c7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"다운로드 중"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"설치 중"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"알 수 없음"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"복원되지 않음"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 5d20d3b..fd8c2c4 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"ກຳລັງດາວໂຫລດ"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"​ກຳ​ລັງ​ຕິດ​ຕັ້ງ"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"​ບໍ່​ຮູ້​ຈັກ"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"ບໍ່​ໄດ້​ກູ້​ຂໍ້ມູນ​ມາ​ເທື່ອ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 72b98f3..471201d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Atsisiunčiama"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Diegiama"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Nežinoma"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Neatkurta"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2963211..6fb7d60 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Lejupielādē"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Instalē"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Nezināma"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Nav atjaunota"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 8d0018f..a8ad568 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Татаж авч байна"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Суулгаж байна"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Тодорхойгүй"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Сэргээгээгүй"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index a5b9dd9..4c4b95f 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Memuat turun"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Memasang"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Tidak diketahui"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Tak dipulihkan"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c2a6285..34cc488 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Laster ned …"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installerer …"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Ukjent"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Ikke gjenoppr."</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4c0cc2e..7bd3025 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Downloaden"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installeren"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Onbekend"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Niet hersteld"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d7153c7..07d7465 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Pobieranie"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Instalowanie"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Brak informacji"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Nie przywrócono"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4d91f6f..0717c52 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"A transferir "</string>
     <string name="package_state_installing" msgid="7588193972189849870">"A instalar"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconhecido"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Não restaurado"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6800ed3..e3f60ae 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Transferindo"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Instalando"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Desconhecido"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Não restaurado"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6897b45..48fa11e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Se descarcă"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Se instalează"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Necunoscut"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Nerestabilit"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a5767a4..8303350 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Скачивается"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Устанавливается"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Неизвестно"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Не восстановлен"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f3071b8..b274926 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Sťahovanie"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Inštalácia"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Neznáme"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Nebolo obnovené"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 23b0819..62d90bb 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Prenašanje"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Nameščanje"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Neznano"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Ni obnovljen"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 443a444..9b30913 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Преузима се"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Инсталира се"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Непознато"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Није враћено"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f9a5f0d..0469a8a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Hämtas"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Installerar"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Okänt"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Inte återställt"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 0074b89..12f2428 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -113,6 +113,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Inapakua"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Inasakinisha"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Yasiyojulikana"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Haijarejeshwa"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1787ebd..1c55e77 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"กำลังดาวน์โหลด"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"กำลังติดตั้ง"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"ไม่รู้จัก"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"ไม่ได้คืนค่า"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index fc3a88d..d30fb11 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Nagda-download"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Nag-i-install"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Hindi kilala"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Hindi naibalik"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 2feb06b..bdc97df 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"İndiriliyor"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Yükleniyor"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Bilinmiyor"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Geri yüklenmedi"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 418f364..94df4f3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Завантаження"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Встановлення"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Невідомо"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Не відновлено"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2667dfc..434b556 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Đang tải xuống"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Đang cài đặt"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Không xác định"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Không được khôi phục"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e81da15..a771f47 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"正在下载"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"正在安装"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"未知"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"无法还原"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 30ba359..ed19b44 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"下載中"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"安裝中"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"無法還原"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f458c52..2449f60 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"下載中…"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"安裝中"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"無法還原"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index a67051a..209816e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -111,6 +111,5 @@
     <string name="package_state_downloading" msgid="4088770468458724721">"Iyalanda"</string>
     <string name="package_state_installing" msgid="7588193972189849870">"Iyafaka"</string>
     <string name="package_state_unknown" msgid="7592128424511031410">"Akwaziwa"</string>
-    <!-- no translation found for package_state_error (7672093962724223588) -->
-    <skip />
+    <string name="package_state_error" msgid="7672093962724223588">"Ayibuyiselwe"</string>
 </resources>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 6474d26..9eb82d3 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -214,7 +214,7 @@
     public static final int EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT = 300;
     public static final int EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT_FOLDER_CLOSE = 400;
     private static final int ON_ACTIVITY_RESULT_ANIMATION_DELAY = 500;
-    private static final int ACTIVITY_START_DELAY = 800;
+    private static final int ACTIVITY_START_DELAY = 1000;
 
     private static final Object sLock = new Object();
     private static int sScreen = DEFAULT_SCREEN;
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index 952edfd..97138ee 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -21,8 +21,11 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.app.ActivityManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.UserManager;
@@ -262,12 +265,21 @@
             Cling c = initCling(R.id.workspace_cling, 0, false, true);
             c.updateWorkspaceBubblePosition();
 
-            // Set the focused hotseat app if there is one
-            c.setFocusedHotseatApp(mLauncher.getFirstRunFocusedHotseatAppDrawableId(),
-                    mLauncher.getFirstRunFocusedHotseatAppRank(),
-                    mLauncher.getFirstRunFocusedHotseatAppComponentName(),
-                    mLauncher.getFirstRunFocusedHotseatAppBubbleTitle(),
-                    mLauncher.getFirstRunFocusedHotseatAppBubbleDescription());
+            try {
+                // We only enable the focused hotseat app if we are preinstalled
+                PackageManager pm = mLauncher.getPackageManager();
+                ApplicationInfo ai = pm.getApplicationInfo(mLauncher.getPackageName(), 0);
+                if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                    // Set the focused hotseat app
+                    c.setFocusedHotseatApp(mLauncher.getFirstRunFocusedHotseatAppDrawableId(),
+                        mLauncher.getFirstRunFocusedHotseatAppRank(),
+                        mLauncher.getFirstRunFocusedHotseatAppComponentName(),
+                        mLauncher.getFirstRunFocusedHotseatAppBubbleTitle(),
+                        mLauncher.getFirstRunFocusedHotseatAppBubbleDescription());
+                }
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+            }
         } else {
             removeCling(R.id.workspace_cling);
         }