Merge change Ibb660dd5 into eclair-mr2

* changes:
  updating sample plugins to support fixed surface dimensions.