Merge "Fix fling back behaviour for CrossTaskBackAnimation" into main