Fixing bug where touch breaks completely after item removed from folder

Change-Id: If60057e5775853d3ac8c092dffe915f8f5a8bce4
3 files changed