Merge "Refinements for DND settings" into sc-dev