Merge "Don't break key event stream when enabling a11y" into oc-dev