Merge "Manage/Clear all pill color" into sc-dev