Merge "Fix ThemePicker build and exclude unused features" into sc-dev