Merge "DCT set up default before enterprise APN" into sc-dev