Merge "Fix update wrong new pending transition finishcallback" into main