Merge "Fix issue #6686339: 2 taps required to launch notification..." into jb-dev