Merge "Mitigate layer leakage in Fullscreen Magnifier" into main