Merge "Use same color for all indicators" into sc-dev