Merge "Add a feature flag to expand smartspace to three rows" into ub-launcher3-master