Merge "Fix build, also always draw accessibility focus rect"