Merge "Fix the non-working DND toggle" into sc-dev