Merge "Using original taskInfo to create the taskKey instead of fake data" into ub-launcher3-master