Merge "Fix trunk transition waiting message"