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