Merge "To correct the DDS when the user turn on mobile data" into main