Merge "Save data registration roaming state" into mnc-dev