Merge "Fixing crash when drawing accessibility focus indicator." into jb-dev