Merge "Fix cross-activity-back scrim covering whole screen" into main