Merge "Skip fade out animator if current type is NO_INDICATOR." into main