Merge "Fix Thread.sleep(0) of an interrupted thread"