Merge "Fix a11y text location in clipped views" into oc-dev