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

Change-Id: I77378ce792eca3774bfaef0bd426068f98926a9d