Merge "Show autofill picker again after user changed a field."