Merge "Improve clear a11y forcus for A11yManagerService"