Merge "Prevent restoring task when updating task"