Merge "Make updateSurface non-blocking" into nyc-mr1-dev
am: 8d521bb9b3

Change-Id: I780518798ae7af101ae70e52fd44092ce18311c5