Merge "Update DndCondition settings summary" into pi-dev