am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '0849a4b9b7dc4e37993ca59cab1db8b43f0d456c': Prevent keyboard A11y proxy from referencing a null keyboard view.main
commit
a6fae701e3
* commit '0849a4b9b7dc4e37993ca59cab1db8b43f0d456c': Prevent keyboard A11y proxy from referencing a null keyboard view.main