Merge "Initial changes to tweak layout." into ub-launcher3-calgary