Merge "Fixing a crash in the TouchExplorer." into jb-dev