Prevent pause notification from getting fired if already in pause state
Merge branch 'master' into standalone