am 1aadd347: Merge "Avoid duplicate surface creation."

* commit '1aadd3474177e6946ea0aae03f0628e436d0cf87':
  Avoid duplicate surface creation.