Merge "Refactor scanPackagesDirtyLI()"