Merge "Revert "Fix onPackageChanged handling of disabled packages""