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

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