Merge "Fixed a race condition for IWLAN handover"