Merge "Trim text from autofillvalue when checking for empty." into oc-dev