Merge "Move dismissal logic into the ScreenshotViewProxy" into main