Merge "Fix Settings app crash while enabling tethering" into klp-dev