Merge "Consider transient-hide tasks in waiting transitions" into main