Merge "Fix letterboxed activity cropped in cross activity back anim" into main