Merge "Allow using task snapshot if new intent is same as previous one"