Merge "Fix scrim offset to (0,0) for letterboxed cross-activity-back" into main