Fix suface crash

Change-Id: I955596cb547dddd2972f24b7bd52c49d76061b55