Merge "Fixed that data connections not tearing down when APN set id changes"