Merge "Protect a11y against multi-threaded UIs" into oc-dr1-dev
am: 10a41f9b12

Change-Id: I24be95a742543ebb89c51a177af8875ce2dc7b43