Merge "Fix crash when accessibility is on" into jb-dev