Merge "Remove grid options pref key" into ub-launcher3-rvc-dev am: 42de4ddc83

Change-Id: I0ed74da6b6b18cd4594b9913bbba10f10da726c3