Merge "Make sure surface control is really valid before giving it to client" into nyc-mr1-dev