Merge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev