Merge "Limit sending of the PACKAGE_CHANGED broadcast" into main