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