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

Change-Id: I50b69d1f061d62e8441816dc70a7bdcdf97d53d3