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

Change-Id: Ic850275cc7f81629adcc5081ec9f137e531b9495