* commit 'fa1a3b14f6d626e8ad6bef41a6ab4bcb01034ba4': Fix build, also always draw accessibility focus rect