Merge "Visual updates for DND screens"