Bug 823953 - Improve sync queue handling. r=bent, a=bajaj