Bug 993134

@mcomella: these make things much more robust for me on my three test devices.  I'm sure there are still problems, but this is helping.