Merge "Don't let non-touchable windows retain a11y focus" into pi-dev