Merge "Minor improvements on autofill compat mode:"