Merge in additional data fixes

These fixes have been through some testing and show some better stability in 3G->4G switching behavior for toro. The testing didn't reveal any bugs with the new code.