Merge "Fix onPackageChanged handling of disabled packages" into tm-dev