Merge "Do not inset autofill highlight" into oc-dev