Merge "Properly remove local color areas of callback" into sc-v2-dev