Merge "Fix crash when pausing DndCondition." into pi-dev