Merge "Fix race condition of removing surface." into oc-dev am: 07a21754f4 -s ours am: 688a98b415 -s ours
am: c9e94b568b -s ours
Change-Id: Ia308c814b6261b92d0e7b44cd2ea4168920b43b1
This commit is contained in: