Merge "Adding content provider for exposing launcher grid settings" into ub-launcher3-master