Merge "Minor Autofill improvements:"