Merge "Use activities' own animations, unless opaque activity on top" into main