am b2c1cfbe: am 0cd545f1: sometimes we would incorrectly scale the content of a surface

* commit 'b2c1cfbe95bed419487455d1b82956f9c5b2a40c':
  sometimes we would incorrectly scale the content of a surface