Merge "standardize system notification IDs" into oc-dev