Merge "Adding support for cross-task hero transition"