Merge "Properly dispose of JavaAdapter collector" into main