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

* commit 'b533f3e1ad098b38070369609e6b1892828bc111':
  Avoid duplicate surface creation.