Merge "Revert "Use colorControlActivated for an active item"" into mnc-ub-dev