Merge "Swipe for notification should be default-on in settings app" into oc-dev