Merge "Reland reset on package remove with autofill fix" into main