Merge "Fade other text out properly when transforming messages"