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

Change-Id: Ib153ffcb4012954950f8c1310a5f08efefecc91d