Merge "Optimize magnifier viewport drawing" into main