resolve merge conflicts of 2fd0208 to ub-launcher3-master

Change-Id: I20ad6eaace81786be080e28d6eb551908add6d90

src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java

@@ -50,7 +50,7 @@ public class AllAppsRecyclerViewContainerView extends RelativeLayout
     public AllAppsRecyclerViewContainerView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
 
-        Launcher launcher = (Launcher) context;
+        Launcher launcher = Launcher.getLauncher(context);
         DeviceProfile grid = launcher.getDeviceProfile();
 
         mTouchFeedbackView = new ClickShadowView(context);