Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev