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

Change-Id: I18637245608dd11728569429f718f757f3a5e7ca