Merge "Use a mock PackageManager instead of the real one" into main