Merge "Fix race condition of removing surface." into oc-dr1-dev
am: e6685b2bcd

Change-Id: I3677cb6f07b2a7c60e72b3f70034fec42adb6dec