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

* commit 'd0d6eb2423ee219f83738f335ed8be9b9153cc01':
  Revert "Use colorControlActivated for an active item"