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

Change-Id: I8463ccc699ec283dfcc2781946e53836f9177d46