Merge "Update colors for non-v31 devices." into sc-dev