Merge "Fix fling back behaviour for CrossActivityBackAnimation" into main