Merge "Safely handle interrupts during Thread.join()"