Merge "Don't clear a11y focus with lock held" into pi-dev