Merge "Avoid cancelling the data disconnected notification unnecessarily" into lmp-mr1-dev