Merge "Separate a11y and autofill view ids" into oc-dev