Merge change 20273

* changes:
  adding ability to fix the size of a surface view when created.