am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev

* commit 'cb13da9772b41c3466c3ed514e6321c2cfb85c2a':
  Revert "Dismiss color fade when it is no longer used."