Merge "Don't let non-touchable windows retain a11y focus" into pi-dev am: 8bbc30955a
am: fd348902e7

Change-Id: I3b78400d58b42049c835adcad4a8d804e40bdebc