Merge "Consider transient-launch in waiting transitions" into main