diff --git a/res/drawable-xlarge-nodpi/bluecrystal.jpg b/res/drawable-xlarge-nodpi/bluecrystal.jpg
new file mode 100755
index 0000000..2fa072b
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/bluecrystal.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/bluecrystal_small.jpg b/res/drawable-xlarge-nodpi/bluecrystal_small.jpg
new file mode 100755
index 0000000..8104743
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/bluecrystal_small.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/bluelinebots.jpg b/res/drawable-xlarge-nodpi/bluelinebots.jpg
new file mode 100644
index 0000000..c8d32a7
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/bluelinebots.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/bluelinebots_small.jpg b/res/drawable-xlarge-nodpi/bluelinebots_small.jpg
new file mode 100755
index 0000000..4de80f1
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/bluelinebots_small.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/bots.jpg b/res/drawable-xlarge-nodpi/bots.jpg
new file mode 100755
index 0000000..922acbb
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/bots.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/bots_small.jpg b/res/drawable-xlarge-nodpi/bots_small.jpg
new file mode 100755
index 0000000..4889897
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/bots_small.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/bucky.jpg b/res/drawable-xlarge-nodpi/bucky.jpg
new file mode 100755
index 0000000..c5a5b3e
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/bucky.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/bucky_small.jpg b/res/drawable-xlarge-nodpi/bucky_small.jpg
new file mode 100755
index 0000000..87b4dc9
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/bucky_small.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/geonova.jpg b/res/drawable-xlarge-nodpi/geonova.jpg
new file mode 100755
index 0000000..f9a37cc
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/geonova.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/geonova_small.jpg b/res/drawable-xlarge-nodpi/geonova_small.jpg
new file mode 100755
index 0000000..2b6a503
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/geonova_small.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/lineofbots.jpg b/res/drawable-xlarge-nodpi/lineofbots.jpg
new file mode 100755
index 0000000..c9f5c79
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/lineofbots.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/lineofbots_small.jpg b/res/drawable-xlarge-nodpi/lineofbots_small.jpg
new file mode 100755
index 0000000..ecb3942
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/lineofbots_small.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/lotus.jpg b/res/drawable-xlarge-nodpi/lotus.jpg
new file mode 100644
index 0000000..1933c20
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/lotus.jpg
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/lotus_small.jpg b/res/drawable-xlarge-nodpi/lotus_small.jpg
new file mode 100644
index 0000000..6b515ef
--- /dev/null
+++ b/res/drawable-xlarge-nodpi/lotus_small.jpg
Binary files differ
diff --git a/res/values-ca-xlarge/strings.xml b/res/values-ca-xlarge/strings.xml
index 63f4a09..b92811b 100644
--- a/res/values-ca-xlarge/strings.xml
+++ b/res/values-ca-xlarge/strings.xml
@@ -20,6 +20,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wallpaper_dialog_title" msgid="5764793286524787718">"Seleccionar un fons de pantalla"</string>
-    <string name="wallpaper_chooser_empty" msgid="7358237455389125747">"No hi ha empaperats disponibles"</string>
+    <string name="wallpaper_chooser_empty" msgid="7358237455389125747">"No hi ha fons de pantalla disponibles"</string>
     <string name="wallpaper_cancel" msgid="6502936522490675611">"Cancel·la"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f0218df..66386a6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -38,7 +38,7 @@
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Spil"</string>
     <!-- outdated translation 7753043607780556423 -->     <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Downloadet"</string>
     <string name="all_apps_no_games" msgid="5293893733372793696">"Ingen spil."</string>
-    <!-- outdated translation 6687010155766000796 -->     <string name="all_apps_no_downloads" msgid="2284720393234453761">"Ingen hentede programmer."</string>
+    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Du har ingen downloadede applikationer."</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Kunne ikke slippe elementet på denne startskærm"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Vælg widget for at oprette"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappenavn"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7e6c82d..e8b518f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -38,7 +38,7 @@
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Παιχνίδια"</string>
     <!-- outdated translation 7753043607780556423 -->     <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Η λήψη ολοκληρώθηκε"</string>
     <string name="all_apps_no_games" msgid="5293893733372793696">"Δεν βρέθηκαν παιχνίδια."</string>
-    <!-- outdated translation 6687010155766000796 -->     <string name="all_apps_no_downloads" msgid="2284720393234453761">"Δεν βρέθηκαν εφαρμογές που έχουν ληφθεί."</string>
+    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Δεν υπάρχουν εφαρμογές από λήψη."</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Δεν έγινε η απόθ. του στοιχείου στην αρχική οθόνη"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Επιλογή γραφ. στοιχείου δημιουργίας"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Όνομα φακέλου"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 61257e6..f15a01c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -38,7 +38,7 @@
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Games"</string>
     <!-- outdated translation 7753043607780556423 -->     <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Downloaded"</string>
     <string name="all_apps_no_games" msgid="5293893733372793696">"No games found."</string>
-    <!-- outdated translation 6687010155766000796 -->     <string name="all_apps_no_downloads" msgid="2284720393234453761">"No downloaded apps found."</string>
+    <string name="all_apps_no_downloads" msgid="2284720393234453761">"You have no downloaded applications."</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Could not drop item onto this home screen"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Select widget to create"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Folder name"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5ed7c09..ede2003 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -38,7 +38,7 @@
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Juegos"</string>
     <!-- outdated translation 7753043607780556423 -->     <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Descargado"</string>
     <string name="all_apps_no_games" msgid="5293893733372793696">"No se encontraron juegos."</string>
-    <!-- outdated translation 6687010155766000796 -->     <string name="all_apps_no_downloads" msgid="2284720393234453761">"No se encontraron apps."</string>
+    <string name="all_apps_no_downloads" msgid="2284720393234453761">"No has descargado ninguna aplicación."</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"No se pudo colocar el elemento en esta pantalla principal"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Seleccionar widget para crear"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Nombre de carpeta"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6b6ba78..cb80a49 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -38,7 +38,7 @@
     <string name="all_apps_tab_games" msgid="1855736784923494918">"משחקים"</string>
     <!-- outdated translation 7753043607780556423 -->     <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"מהורדות"</string>
     <string name="all_apps_no_games" msgid="5293893733372793696">"לא נמצאו משחקים."</string>
-    <!-- outdated translation 6687010155766000796 -->     <string name="all_apps_no_downloads" msgid="2284720393234453761">"לא נמצאו יישומים שהורדו."</string>
+    <string name="all_apps_no_downloads" msgid="2284720393234453761">"לא הורדת יישומים."</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"אין אפשרות להניח פריט במסך בית זה"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"בחר widget כדי ליצור"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"שם תיקיה"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 123b67b..bb67115 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -38,7 +38,7 @@
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Žaidimai"</string>
     <!-- outdated translation 7753043607780556423 -->     <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Atsisiųsta"</string>
     <string name="all_apps_no_games" msgid="5293893733372793696">"Nerasta žaidimų."</string>
-    <!-- outdated translation 6687010155766000796 -->     <string name="all_apps_no_downloads" msgid="2284720393234453761">"Nerasta atsisiųstų programų."</string>
+    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Neturite atsisiųstų programų."</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Nepavyko pašalinti elemento šiame pagr. ekrane"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Pasirinkti norimą sukurti valdiklį"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Aplanko pavadinimas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0b75388..7a016a6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -38,7 +38,7 @@
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Spēles"</string>
     <!-- outdated translation 7753043607780556423 -->     <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Lejupielādētās"</string>
     <string name="all_apps_no_games" msgid="5293893733372793696">"Nav nevienas spēles."</string>
-    <!-- outdated translation 6687010155766000796 -->     <string name="all_apps_no_downloads" msgid="2284720393234453761">"Nav lejupielādētu lietotņu."</string>
+    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Nav ielādēta neviena lietojumprogramma."</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Nevarēja nomest vienumu šajā sākumekrānā."</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Atlasīt izveidojamo logrīku"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Mapes nosaukums"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9f6f91f..bee708c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -38,7 +38,7 @@
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Spill"</string>
     <!-- outdated translation 7753043607780556423 -->     <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Nedlastet"</string>
     <string name="all_apps_no_games" msgid="5293893733372793696">"Finner ingen spill."</string>
-    <!-- outdated translation 6687010155766000796 -->     <string name="all_apps_no_downloads" msgid="2284720393234453761">"Finner ingen nedlastede programmer."</string>
+    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Du har ingen nedlastede programmer."</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Kunne ikke slippe elementet på denne startskjermen"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Velg modul for oppretting"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Mappenavn"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 18f47a4..3277c07 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -38,7 +38,7 @@
     <string name="all_apps_tab_games" msgid="1855736784923494918">"Trò chơi"</string>
     <!-- outdated translation 7753043607780556423 -->     <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Đã tải xuống"</string>
     <string name="all_apps_no_games" msgid="5293893733372793696">"Không tìm thấy trò chơi."</string>
-    <!-- outdated translation 6687010155766000796 -->     <string name="all_apps_no_downloads" msgid="2284720393234453761">"Không tìm thấy ư.dụng được t.xuống."</string>
+    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Bạn không có ứng dụng nào được tải xuống."</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Không thể thả mục vào màn hình chính này"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Chọn tiện ích để tạo"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Tên thư mục"</string>
diff --git a/res/values-xlarge/wallpapers.xml b/res/values-xlarge/wallpapers.xml
index 33c964b..04e3d66 100644
--- a/res/values-xlarge/wallpapers.xml
+++ b/res/values-xlarge/wallpapers.xml
@@ -17,7 +17,12 @@
 
 <resources>
     <string-array name="wallpapers" translatable="false">
-        <item>glow_wallpaper</item>
+	<item>bluecrystal</item>
+	<item>bluelinebots</item>
+	<item>bots</item>
+	<item>bucky</item>
+	<item>geonova</item>
         <item>city_wallpaper</item>
+	<item>lotus</item>
     </string-array>
 </resources>
diff --git a/res/values-zh-rCN-xlarge/strings.xml b/res/values-zh-rCN-xlarge/strings.xml
index 2b9866d..323cce2 100644
--- a/res/values-zh-rCN-xlarge/strings.xml
+++ b/res/values-zh-rCN-xlarge/strings.xml
@@ -20,6 +20,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wallpaper_dialog_title" msgid="5764793286524787718">"选择壁纸"</string>
-    <string name="wallpaper_chooser_empty" msgid="7358237455389125747">"没有可用壁纸"</string>
+    <string name="wallpaper_chooser_empty" msgid="7358237455389125747">"无可用壁纸"</string>
     <string name="wallpaper_cancel" msgid="6502936522490675611">"取消"</string>
 </resources>
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index f3208d0..faf9bc6 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2690,6 +2690,10 @@
             }
 
             scaleAnim.setInterpolator(new Workspace.ZoomOutInterpolator());
+            // Only use hardware layers in portrait mode, they don't give any gains in landscape
+            if (mWorkspace.getWidth() < mWorkspace.getHeight()) {
+                toView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+            }
             scaleAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationStart(Animator animation) {
@@ -2706,6 +2710,7 @@
                     // If we don't set the final scale values here, if this animation is cancelled
                     // it will have the wrong scale value and subsequent cameraPan animations will
                     // not fix that
+                    toView.setLayerType(View.LAYER_TYPE_NONE, null);
                     toView.setScaleX(1.0f);
                     toView.setScaleY(1.0f);
                 }
@@ -3476,6 +3481,15 @@
             mSavedInstanceState = null;
         }
 
+        // Workaround a bug that occurs when rotating the device while the customization mode is
+        // open, we trigger a new layout on all the CellLayout children.
+        if (LauncherApplication.isScreenXLarge() && (mState == State.CUSTOMIZE)) {
+            final int childCount = mWorkspace.getChildCount();
+            for (int i = 0; i < childCount; ++i) {
+                mWorkspace.getChildAt(i).requestLayout();
+            }
+        }
+
         mWorkspaceLoading = false;
     }