Merge "Don't show autofill settings if not enabled" into oc-dev