Merge "Fix ScreenshotShelfView gesture handling" into 24D1-dev