Merge "Fix Screen Magnification recursive draw"