Merge "Swipe for notification should be default-on in settings app" into oc-dev am: 9ab1318ca8
am: f921f8e77e

Change-Id: I3337bcba8a7baa4038f7c72d8eb9658311c0c435