Merge "Fix race condition of removing surface." into oc-dev am: 07a21754f4 am: 4515fb8e9c -s ours
am: 9b3e04565c -s ours
Change-Id: I0e6e5a72816c14cfd1c0800d7d949521235d56f6
This commit is contained in: