Merge "Reset logging name of Task at the end of setIntent" into main