Merge "Fix Tethering settings." into ics-mr0