Merge "Refactor isTetheringSupported() calls" into pi-dev