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

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