Merge "Fix issue #6717667: expanded notification actions don't work on the lock screen" into jb-dev