Merge "[Magnifier-32] Do not magnify outside selection" into pi-dev