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