Merge "Fix NPE in package manager when asserting overlays" into pi-dev