Merge "Allow dnd access for secondary users" into oc-mr1-dev