Merge "Fix magnification border includes taskbar" into sc-v2-dev