Merge "Remove grid provider from launcher until all apps grid is addressed" into ub-launcher3-master