Merge "Fix nomanservice notificationrecord leak" into oc-dev