feat(DENG-9583): Fix normalized_app_id and uri_count

Author: kwindau

sql_generators/glean_usage/templates/clients_last_seen_joined.query.sql

@@ -6,9 +6,6 @@ WITH baseline AS (
     {% if app_name != "firefox_desktop" %}
       normalized_app_id,
     {% endif %}
-    {% if app_name == "firefox_ios" %}
-      uri_count,
-    {% endif %}
     days_since_seen,
     days_since_active,
     days_since_created_profile,
@@ -71,12 +68,15 @@ metrics AS (
     submission_date,
     client_id,
     sample_id,
+    {% if app_name == "firefox_desktop" %}
+      profile_group_id,
+    {% endif %}
+    {% if app_name == "firefox_ios" %}
+      uri_count,
+    {% endif %}
     normalized_channel,
     n_metrics_ping,
     days_sent_metrics_ping_bits,
-    {% if app_name == "firefox_desktop" %}
-      profile_group_id
-    {% endif %}
   FROM
     `{{ project_id }}.{{ app_name }}.metrics_clients_last_seen`
   WHERE
@@ -92,11 +92,11 @@ SELECT
   {% if app_name == "firefox_desktop" %}
     baseline.days_since_desktop_active,
   {% endif %}
-  {% if app_name != "firefox_desktop" %}
+  {% if app_name not in ["firefox_desktop", "mozphab", "burnham", "firefox_desktop_background_update"] %}
     baseline.normalized_app_id,
   {% endif %}
   {% if app_name == "firefox_ios" %}
-    baseline.uri_count,
+    metrics.uri_count,
   {% endif %}
   baseline.days_since_seen,
   baseline.days_since_active,