Merge "When removing a task that was on home, put home on top." into klp-dev