Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf

src/com/android/launcher3/LauncherModel.java

@@ -496,8 +496,7 @@ public class LauncherModel extends BroadcastReceiver {
             if (stackTrace != null) {
                 e.setStackTrace(stackTrace);
             }
-            // TODO: something breaks this in the upgrade path
-            //throw e;
+            throw e;
         }
     }