Merge "Using icon color for dot and halo" into sc-dev