Merge "Fix flicker in cross-activity-back-animation" into main