Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev