Merge "Removing state from TISBinder" into main