Merge "Fix onSwitchIdleEvent echo request-reply xid"