Merge "IMS-VT: Do not create new surface when setting surface dimensions" into nyc-dev