Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev