Merge "Allow some system notifications to be blocked." into oc-dev