Fixed notification intent might not be set, causing crash on GB and bug on higher Android versions.
Merge remote-tracking branch 'origin/master'