Merge "Rename CrossActivityAnimation to CrossActivityBackAnimation" into main