Merge "Don't break key event stream when enabling a11y" into oc-dev am: bb8a7983ff am: 2bf63f4fde
am: 3c7022a6ff

Change-Id: Ieffa4ba90349b9e771da9a07854e8af25cd68acd