Merge "Fix DND display error when caller is DO/PO" into udc-qpr-dev