Merge "Update ringer to take BT device into account"