Merge "Revert "Disable grid option feature in ThemePicker"" into rvc-d1-dev