Merge "Update setting pickers to use default theme for watches." into cw-f-dev