Disable variable_watch for Phone name escapes & fix location where we'll escapeQuotes() to compare device names (so they don't fail the comparison)