Merge "Fix CrossFade transition"