Merge "Update to ToT RemoteCompose" into main