Merge "[Magnifier-32] Do not magnify outside selection" into pi-dev
am: 8a06a9f7dd

Change-Id: I852adb48ef86e3346c27bdecaf8d523107f8ce80