Bug 957693: Fix a worker hang and other related bugs. r=bent