Merge "Reuse createOpenTaskDecoration() as much as possible" into main