Merge "Make updateSurface non-blocking" into nyc-mr1-dev