Merge "Add/fix null-check on ringtoneSupplier." into udc-dev