Merge "Add settings for persisting the mobile data connection." into mnc-dev