Merge "DO NOT MERGE DND settings redesign" into pi-dev