Merge change Ib3558f35 into eclair-mr2

* changes:
  Make our choice of surface explicit.