Merge "Fixed autofill forged package check to only compare the package name." into pi-dev