Merge "Clear manual bouncer transitionId on CANCELED steps." into main