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

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