Merge "Merge "Media transition must crossfade when transitioning to transparent" into tm-dev am: 8b5e8952" into tm-dev-plus-aosp