Merge "Merge "Fix race condition of removing surface." into oc-dev am: 07a21754 -s ours am: 688a98b4 -s ours" into oc-dr1-dev-plus-aosp