Merge "Update DND people Settings pages" into rvc-dev