Merge "Don't cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev