Merge "Crash in the TouchExplorer"