Merge "Do not magnify if surface control is not set" into pi-dev
am: 1072d0d18a

Change-Id: I672e8ad0363775c846dcfbb86ef1c98242a8c40a