Merge "Priority only dnd doesn't change ringer" into pi-dev