Merge "Revert "Do NOT MERGE Fix magnification border includes taskbar"" into sc-v2-dev