Merge "Fix grid options provider metadata" into ub-launcher3-master