Merge "Do not set dispose callback when flag is enabled" into main