Merge "Cancelling the notification once the satellite conenction got disconnected" into main