Merge "Merge "Fix ScreenshotShelfView gesture handling" into 24D1-dev am: 25c685dca9" into main