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

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