Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"