Merge "Fix race condition of removing surface." into oc-dev am: 07a21754f4
am: 4515fb8e9c  -s ours

Change-Id: I705e3cc47ad70c80f91c104c2aa16c446b89e229