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