Merge "Use screen space to calculate snapshot scale" into main