Merge "Updating the UI for focused state of an icon/folder." into ub-now-porkchop

src/com/android/launcher3/CellLayout.java

@@ -971,10 +971,7 @@ public class CellLayout extends ViewGroup {
     }
 
     public ShortcutAndWidgetContainer getShortcutsAndWidgets() {
-        if (getChildCount() > 0) {
-            return (ShortcutAndWidgetContainer) getChildAt(0);
-        }
-        return null;
+        return mShortcutsAndWidgets;
     }
 
     public View getChildAt(int x, int y) {