Merge "Keeping notifications around that show guts" into oc-dr1-dev