Merge "Fix TetherSettings crash issue" into udc-dev