Merge "Protect a11y against multi-threaded UIs" into oc-dr1-dev