Merge "Fix one NPE in tethering setting"