Merge "Update DND visual interruption choices." into nyc-dev