Snap for 6379507 from 77bdfd63d0 to mainline-release

Change-Id: I91818c882ad1ceba2de79dc356ef802f163cc022

src/com/android/launcher3/ItemInfo.java

@@ -248,6 +248,7 @@ public class ItemInfo {
         LauncherAtom.ItemInfo.Builder itemBuilder = LauncherAtom.ItemInfo.newBuilder();
         itemBuilder.setIsWork(user != Process.myUserHandle());
         ComponentName cn = getTargetComponent();
+        if (cn == null) return itemBuilder.build();
         switch (itemType) {
             case ITEM_TYPE_APPLICATION:
                 itemBuilder.setApplication(LauncherAtom.Application.newBuilder()

src/com/android/launcher3/Workspace.java

@@ -282,6 +282,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
 
         Rect padding = grid.workspacePadding;
         setPadding(padding.left, padding.top, padding.right, padding.bottom);
+        mInsets.set(insets);
 
         if (mWorkspaceFadeInAdjacentScreens) {
             // In landscape mode the page spacing is set to the default.