Merge "Do not magnify if surface control is not set" into pi-dev