Merge "Client app crashes if accessibility service uses invalid focus type." into jb-dev