Merge "Rename a few more animations classes to cover transitions in general." into main