Merge "Implement the rest of autofill importance modes" into oc-dev