Merge "Hide password for wifi tether" into pi-dev