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

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