Merge "Properly restart ringtone when BT device connected" into rvc-dev