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

Change-Id: I1358805c52332bc79810117a6d0407273cae0ed7