Merge "Reland "Optimize magnifier viewport drawing"" into main