Merge "Revert "Fix text crossfade"" into tm-dev