Merge "Fix issue #17829949: Don't kill Bluetooth service..." into lmp-dev