Merge "Add swipe dismissal for screenshot shelf view" into main