Merge "Portrait grid changes for Workspace/All Apps." into ub-launcher3-dorval-polish
am: bacc582817

Change-Id: Id332cf749a7dd46993786668437409da886c4258