Merge "Enable USE_SURFACE_VIEW_FOR_GRID_PREVIEW flag" into ub-launcher3-master