Merge "Guard swipe to notification gesture with system settings preference"