Merge "Send package-changed broadcasts to the correct users" into jb-mr2-dev