Merge "Remove grid options pref key" into ub-launcher3-rvc-dev