Merge "Force autofill on overflow only if empty" into oc-dev