Merge "Merge "Disable grid option feature in ThemePicker" into rvc-dev am: cb2473cf3f am: 15816e2cb3" into rvc-d1-dev-plus-aosp