Merge "Fix the NPE issue in the Internet Settings" into sc-dev