Merge "Reset the remote transition references on the main shell thread" into main