Fixing issue where defered unbind was running after synchronous bind. (Bug 6858398, Bug 6863181)

Change-Id: I03dc3ae18528901cc88c79638a8495c1ab8d61af
2 files changed