Merge "Do not synchronize tile state callbacks" into main