Merge "Move screenshot scroll capture code into its own package" into main