Merge "Fix race condition of removing surface." into oc-dr1-dev