Make updateSurface non-blocking
am: cd68212f08

Change-Id: I691e5a2979e92572440ad7c410e8f0cec6169beb