Merge "Fix DND conditional null state" into nyc-dev