Merge "Revert "Update to ToT RemoteCompose"" into main