Merge "Stop system process crash in TouchExplorer" into oc-dev