Merge "Media transition must crossfade when transitioning to transparent" into tm-dev