Cancel touch focus when actor is removed. Renamed cancelTouchFocus to cancelTouchFocusExcept.

closes #2374
Merge remote-tracking branch 'origin/master'