Merge "Don't animate TIL error if we've been given the same error" into mnc-ub-dev