Merge "Fix notification gestures." into jb-dev