Merge "Notification settings, importance and pre-O apps" into oc-dev