Merge "Fix flicker when cancelling cross-activity back animation when letterboxed" into main