Merge "Revert "DO NOT MERGE Fix the cutout of magnification border"" into sc-v2-dev