diff --git a/.github/ISSUE_TEMPLATE/task.yml b/.github/ISSUE_TEMPLATE/task.yml
new file mode 100644
index 00000000000000..b5d2b1deb06892
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/task.yml
@@ -0,0 +1,51 @@
+name: Task
+description: For staff only - Create a task
+type: Task
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## ⚠️ RESTRICTED ACCESS
+
+        **This form is restricted to Open Home Foundation staff, authorized contributors, and integration code owners only.**
+
+        If you are a community member wanting to contribute, please:
+        - For bug reports: Use the [bug report form](https://github.com/home-assistant/core/issues/new?template=bug_report.yml)
+        - For feature requests: Submit to [Feature Requests](https://github.com/orgs/home-assistant/discussions)
+
+        ---
+
+        ### For authorized contributors
+
+        Use this form to create tasks for development work, improvements, or other actionable items that need to be tracked.
+  - type: textarea
+    id: description
+    attributes:
+      label: Task description
+      description: |
+        Provide a clear and detailed description of the task that needs to be accomplished.
+
+        Be specific about what needs to be done, why it's important, and any constraints or requirements.
+      placeholder: |
+        Describe the task, including:
+        - What needs to be done
+        - Why this task is needed
+        - Expected outcome
+        - Any constraints or requirements
+    validations:
+      required: true
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: Additional context
+      description: |
+        Any additional information, links, research, or context that would be helpful.
+
+        Include links to related issues, research, prototypes, roadmap opportunities etc.
+      placeholder: |
+        - Roadmap opportunity: [links]
+        - Feature request: [link]
+        - Technical design documents: [link]
+        - Prototype/mockup: [link]
+    validations:
+      required: false
diff --git a/.github/workflows/restrict-task-creation.yml b/.github/workflows/restrict-task-creation.yml
new file mode 100644
index 00000000000000..0a6be15180b6b8
--- /dev/null
+++ b/.github/workflows/restrict-task-creation.yml
@@ -0,0 +1,84 @@
+name: Restrict task creation
+
+# yamllint disable-line rule:truthy
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  check-authorization:
+    runs-on: ubuntu-latest
+    # Only run if this is a Task issue type (from the issue form)
+    if: github.event.issue.issue_type == 'Task'
+    steps:
+      - name: Check if user is authorized
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const issueAuthor = context.payload.issue.user.login;
+
+            // First check if user is an organization member
+            try {
+              await github.rest.orgs.checkMembershipForUser({
+                org: 'home-assistant',
+                username: issueAuthor
+              });
+              console.log(`✅ ${issueAuthor} is an organization member`);
+              return; // Authorized, no need to check further
+            } catch (error) {
+              console.log(`ℹ️ ${issueAuthor} is not an organization member, checking codeowners...`);
+            }
+
+            // If not an org member, check if they're a codeowner
+            try {
+              // Fetch CODEOWNERS file from the repository
+              const { data: codeownersFile } = await github.rest.repos.getContent({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                path: 'CODEOWNERS',
+                ref: 'dev'
+              });
+
+              // Decode the content (it's base64 encoded)
+              const codeownersContent = Buffer.from(codeownersFile.content, 'base64').toString('utf-8');
+
+              // Check if the issue author is mentioned in CODEOWNERS
+              // GitHub usernames in CODEOWNERS are prefixed with @
+              if (codeownersContent.includes(`@${issueAuthor}`)) {
+                console.log(`✅ ${issueAuthor} is a integration code owner`);
+                return; // Authorized
+              }
+            } catch (error) {
+              console.error('Error checking CODEOWNERS:', error);
+            }
+
+            // If we reach here, user is not authorized
+            console.log(`❌ ${issueAuthor} is not authorized to create Task issues`);
+
+            // Close the issue with a comment
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: `Hi @${issueAuthor}, thank you for your contribution!\n\n` +
+                    `Task issues are restricted to Open Home Foundation staff, authorized contributors, and integration code owners.\n\n` +
+                    `If you would like to:\n` +
+                    `- Report a bug: Please use the [bug report form](https://github.com/home-assistant/core/issues/new?template=bug_report.yml)\n` +
+                    `- Request a feature: Please submit to [Feature Requests](https://github.com/orgs/home-assistant/discussions)\n\n` +
+                    `If you believe you should have access to create Task issues, please contact the maintainers.`
+            });
+
+            await github.rest.issues.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              state: 'closed'
+            });
+
+            // Add a label to indicate this was auto-closed
+            await github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              labels: ['auto-closed']
+            });
diff --git a/homeassistant/components/androidtv_remote/__init__.py b/homeassistant/components/androidtv_remote/__init__.py
index 28a372da4eab7f..c8556b6da902f2 100644
--- a/homeassistant/components/androidtv_remote/__init__.py
+++ b/homeassistant/components/androidtv_remote/__init__.py
@@ -5,26 +5,18 @@
 from asyncio import timeout
 import logging
 
-from androidtvremote2 import (
-    AndroidTVRemote,
-    CannotConnect,
-    ConnectionClosed,
-    InvalidAuth,
-)
-
-from homeassistant.config_entries import ConfigEntry
+from androidtvremote2 import CannotConnect, ConnectionClosed, InvalidAuth
+
 from homeassistant.const import CONF_HOST, CONF_NAME, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 
-from .helpers import create_api, get_enable_ime
+from .helpers import AndroidTVRemoteConfigEntry, create_api, get_enable_ime
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS: list[Platform] = [Platform.MEDIA_PLAYER, Platform.REMOTE]
 
-AndroidTVRemoteConfigEntry = ConfigEntry[AndroidTVRemote]
-
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: AndroidTVRemoteConfigEntry
@@ -82,13 +74,17 @@ def on_hass_stop(event: Event) -> None:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: AndroidTVRemoteConfigEntry
+) -> bool:
     """Unload a config entry."""
     _LOGGER.debug("async_unload_entry: %s", entry.data)
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_update_options(hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def async_update_options(
+    hass: HomeAssistant, entry: AndroidTVRemoteConfigEntry
+) -> None:
     """Handle options update."""
     _LOGGER.debug(
         "async_update_options: data: %s options: %s", entry.data, entry.options
diff --git a/homeassistant/components/androidtv_remote/config_flow.py b/homeassistant/components/androidtv_remote/config_flow.py
index 78f24fc498ce46..351cae61b1dd44 100644
--- a/homeassistant/components/androidtv_remote/config_flow.py
+++ b/homeassistant/components/androidtv_remote/config_flow.py
@@ -16,7 +16,7 @@
 
 from homeassistant.config_entries import (
     SOURCE_REAUTH,
-    ConfigEntry,
+    SOURCE_RECONFIGURE,
     ConfigFlow,
     ConfigFlowResult,
     OptionsFlow,
@@ -33,7 +33,7 @@
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import CONF_APP_ICON, CONF_APP_NAME, CONF_APPS, CONF_ENABLE_IME, DOMAIN
-from .helpers import create_api, get_enable_ime
+from .helpers import AndroidTVRemoteConfigEntry, create_api, get_enable_ime
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -41,12 +41,6 @@
 CONF_APP_DELETE = "app_delete"
 CONF_APP_ID = "app_id"
 
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required("host"): str,
-    }
-)
-
 STEP_PAIR_DATA_SCHEMA = vol.Schema(
     {
         vol.Required("pin"): str,
@@ -67,7 +61,7 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle the initial step."""
+        """Handle the initial and reconfigure step."""
         errors: dict[str, str] = {}
         if user_input is not None:
             self.host = user_input[CONF_HOST]
@@ -76,15 +70,32 @@ async def async_step_user(
                 await api.async_generate_cert_if_missing()
                 self.name, self.mac = await api.async_get_name_and_mac()
                 await self.async_set_unique_id(format_mac(self.mac))
+                if self.source == SOURCE_RECONFIGURE:
+                    self._abort_if_unique_id_mismatch()
+                    return self.async_update_reload_and_abort(
+                        self._get_reconfigure_entry(),
+                        data={
+                            CONF_HOST: self.host,
+                            CONF_NAME: self.name,
+                            CONF_MAC: self.mac,
+                        },
+                    )
                 self._abort_if_unique_id_configured(updates={CONF_HOST: self.host})
                 return await self._async_start_pair()
             except (CannotConnect, ConnectionClosed):
                 # Likely invalid IP address or device is network unreachable. Stay
                 # in the user step allowing the user to enter a different host.
                 errors["base"] = "cannot_connect"
+        else:
+            user_input = {}
+        default_host = user_input.get(CONF_HOST, vol.UNDEFINED)
+        if self.source == SOURCE_RECONFIGURE:
+            default_host = self._get_reconfigure_entry().data[CONF_HOST]
         return self.async_show_form(
-            step_id="user",
-            data_schema=STEP_USER_DATA_SCHEMA,
+            step_id="reconfigure" if self.source == SOURCE_RECONFIGURE else "user",
+            data_schema=vol.Schema(
+                {vol.Required(CONF_HOST, default=default_host): str}
+            ),
             errors=errors,
         )
 
@@ -217,10 +228,16 @@ async def async_step_reauth_confirm(
             errors=errors,
         )
 
+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle reconfiguration."""
+        return await self.async_step_user(user_input)
+
     @staticmethod
     @callback
     def async_get_options_flow(
-        config_entry: ConfigEntry,
+        config_entry: AndroidTVRemoteConfigEntry,
     ) -> AndroidTVRemoteOptionsFlowHandler:
         """Create the options flow."""
         return AndroidTVRemoteOptionsFlowHandler(config_entry)
@@ -229,7 +246,7 @@ def async_get_options_flow(
 class AndroidTVRemoteOptionsFlowHandler(OptionsFlow):
     """Android TV Remote options flow."""
 
-    def __init__(self, config_entry: ConfigEntry) -> None:
+    def __init__(self, config_entry: AndroidTVRemoteConfigEntry) -> None:
         """Initialize options flow."""
         self._apps: dict[str, Any] = dict(config_entry.options.get(CONF_APPS, {}))
         self._conf_app_id: str | None = None
diff --git a/homeassistant/components/androidtv_remote/diagnostics.py b/homeassistant/components/androidtv_remote/diagnostics.py
index 41595451be80b6..add28b807e9381 100644
--- a/homeassistant/components/androidtv_remote/diagnostics.py
+++ b/homeassistant/components/androidtv_remote/diagnostics.py
@@ -8,7 +8,7 @@
 from homeassistant.const import CONF_HOST, CONF_MAC
 from homeassistant.core import HomeAssistant
 
-from . import AndroidTVRemoteConfigEntry
+from .helpers import AndroidTVRemoteConfigEntry
 
 TO_REDACT = {CONF_HOST, CONF_MAC}
 
diff --git a/homeassistant/components/androidtv_remote/entity.py b/homeassistant/components/androidtv_remote/entity.py
index bf146a11e131d7..7a1e2d6bf069b8 100644
--- a/homeassistant/components/androidtv_remote/entity.py
+++ b/homeassistant/components/androidtv_remote/entity.py
@@ -6,7 +6,6 @@
 
 from androidtvremote2 import AndroidTVRemote, ConnectionClosed
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
@@ -14,6 +13,7 @@
 from homeassistant.helpers.entity import Entity
 
 from .const import CONF_APPS, DOMAIN
+from .helpers import AndroidTVRemoteConfigEntry
 
 
 class AndroidTVRemoteBaseEntity(Entity):
@@ -23,7 +23,9 @@ class AndroidTVRemoteBaseEntity(Entity):
     _attr_has_entity_name = True
     _attr_should_poll = False
 
-    def __init__(self, api: AndroidTVRemote, config_entry: ConfigEntry) -> None:
+    def __init__(
+        self, api: AndroidTVRemote, config_entry: AndroidTVRemoteConfigEntry
+    ) -> None:
         """Initialize the entity."""
         self._api = api
         self._host = config_entry.data[CONF_HOST]
diff --git a/homeassistant/components/androidtv_remote/helpers.py b/homeassistant/components/androidtv_remote/helpers.py
index cdd67b029fc186..a67d5839ee6835 100644
--- a/homeassistant/components/androidtv_remote/helpers.py
+++ b/homeassistant/components/androidtv_remote/helpers.py
@@ -10,6 +10,8 @@
 
 from .const import CONF_ENABLE_IME, CONF_ENABLE_IME_DEFAULT_VALUE
 
+AndroidTVRemoteConfigEntry = ConfigEntry[AndroidTVRemote]
+
 
 def create_api(hass: HomeAssistant, host: str, enable_ime: bool) -> AndroidTVRemote:
     """Create an AndroidTVRemote instance."""
@@ -23,6 +25,6 @@ def create_api(hass: HomeAssistant, host: str, enable_ime: bool) -> AndroidTVRem
     )
 
 
-def get_enable_ime(entry: ConfigEntry) -> bool:
+def get_enable_ime(entry: AndroidTVRemoteConfigEntry) -> bool:
     """Get value of enable_ime option or its default value."""
     return entry.options.get(CONF_ENABLE_IME, CONF_ENABLE_IME_DEFAULT_VALUE)
diff --git a/homeassistant/components/androidtv_remote/manifest.json b/homeassistant/components/androidtv_remote/manifest.json
index 7896f7eefc8dd3..9f41d8230c6cc6 100644
--- a/homeassistant/components/androidtv_remote/manifest.json
+++ b/homeassistant/components/androidtv_remote/manifest.json
@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["androidtvremote2"],
-  "requirements": ["androidtvremote2==0.2.2"],
+  "requirements": ["androidtvremote2==0.2.3"],
   "zeroconf": ["_androidtvremote2._tcp.local."]
 }
diff --git a/homeassistant/components/androidtv_remote/media_player.py b/homeassistant/components/androidtv_remote/media_player.py
index 5bc205b32df2e4..e4f653cbcf123a 100644
--- a/homeassistant/components/androidtv_remote/media_player.py
+++ b/homeassistant/components/androidtv_remote/media_player.py
@@ -5,7 +5,7 @@
 import asyncio
 from typing import Any
 
-from androidtvremote2 import AndroidTVRemote, ConnectionClosed
+from androidtvremote2 import AndroidTVRemote, ConnectionClosed, VolumeInfo
 
 from homeassistant.components.media_player import (
     BrowseMedia,
@@ -20,9 +20,9 @@
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AndroidTVRemoteConfigEntry
 from .const import CONF_APP_ICON, CONF_APP_NAME, DOMAIN
 from .entity import AndroidTVRemoteBaseEntity
+from .helpers import AndroidTVRemoteConfigEntry
 
 PARALLEL_UPDATES = 0
 
@@ -75,13 +75,11 @@ def _update_current_app(self, current_app: str) -> None:
             else current_app
         )
 
-    def _update_volume_info(self, volume_info: dict[str, str | bool]) -> None:
+    def _update_volume_info(self, volume_info: VolumeInfo) -> None:
         """Update volume info."""
         if volume_info.get("max"):
-            self._attr_volume_level = int(volume_info["level"]) / int(
-                volume_info["max"]
-            )
-            self._attr_is_volume_muted = bool(volume_info["muted"])
+            self._attr_volume_level = volume_info["level"] / volume_info["max"]
+            self._attr_is_volume_muted = volume_info["muted"]
         else:
             self._attr_volume_level = None
             self._attr_is_volume_muted = None
@@ -93,7 +91,7 @@ def _current_app_updated(self, current_app: str) -> None:
         self.async_write_ha_state()
 
     @callback
-    def _volume_info_updated(self, volume_info: dict[str, str | bool]) -> None:
+    def _volume_info_updated(self, volume_info: VolumeInfo) -> None:
         """Update the state when the volume info changes."""
         self._update_volume_info(volume_info)
         self.async_write_ha_state()
@@ -102,8 +100,10 @@ async def async_added_to_hass(self) -> None:
         """Register callbacks."""
         await super().async_added_to_hass()
 
-        self._update_current_app(self._api.current_app)
-        self._update_volume_info(self._api.volume_info)
+        if self._api.current_app is not None:
+            self._update_current_app(self._api.current_app)
+        if self._api.volume_info is not None:
+            self._update_volume_info(self._api.volume_info)
 
         self._api.add_current_app_updated_callback(self._current_app_updated)
         self._api.add_volume_info_updated_callback(self._volume_info_updated)
diff --git a/homeassistant/components/androidtv_remote/remote.py b/homeassistant/components/androidtv_remote/remote.py
index 212b0491d2de40..612d27de189ae9 100644
--- a/homeassistant/components/androidtv_remote/remote.py
+++ b/homeassistant/components/androidtv_remote/remote.py
@@ -20,9 +20,9 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import AndroidTVRemoteConfigEntry
 from .const import CONF_APP_NAME
 from .entity import AndroidTVRemoteBaseEntity
+from .helpers import AndroidTVRemoteConfigEntry
 
 PARALLEL_UPDATES = 0
 
@@ -63,7 +63,8 @@ async def async_added_to_hass(self) -> None:
         self._attr_activity_list = [
             app.get(CONF_APP_NAME, "") for app in self._apps.values()
         ]
-        self._update_current_app(self._api.current_app)
+        if self._api.current_app is not None:
+            self._update_current_app(self._api.current_app)
         self._api.add_current_app_updated_callback(self._current_app_updated)
 
     async def async_will_remove_from_hass(self) -> None:
diff --git a/homeassistant/components/androidtv_remote/strings.json b/homeassistant/components/androidtv_remote/strings.json
index c82b815e27a51b..d0eb1d0dca4cb4 100644
--- a/homeassistant/components/androidtv_remote/strings.json
+++ b/homeassistant/components/androidtv_remote/strings.json
@@ -6,6 +6,18 @@
         "description": "Enter the IP address of the Android TV you want to add to Home Assistant. It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the Android TV device."
+        }
+      },
+      "reconfigure": {
+        "description": "Update the IP address of this previously configured Android TV device.",
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the Android TV device."
         }
       },
       "zeroconf_confirm": {
@@ -16,6 +28,9 @@
         "description": "Enter the pairing code displayed on the Android TV ({name}).",
         "data": {
           "pin": "[%key:common::config_flow::data::pin%]"
+        },
+        "data_description": {
+          "pin": "Pairing code displayed on the Android TV device."
         }
       },
       "reauth_confirm": {
@@ -32,7 +47,9 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+      "unique_id_mismatch": "Please ensure you reconfigure against the same device."
     }
   },
   "options": {
@@ -40,7 +57,11 @@
       "init": {
         "data": {
           "apps": "Configure applications list",
-          "enable_ime": "Enable IME. Needed for getting the current app. Disable for devices that show 'Use keyboard on mobile device screen' instead of the on screen keyboard."
+          "enable_ime": "Enable IME"
+        },
+        "data_description": {
+          "apps": "Here you can define the list of applications, specify names and icons that will be displayed in the UI.",
+          "enable_ime": "Enable this option to be able to get the current app name and send text as keyboard input. Disable it for devices that show 'Use keyboard on mobile device screen' instead of the on-screen keyboard."
         }
       },
       "apps": {
@@ -53,8 +74,10 @@
           "app_delete": "Check to delete this application"
         },
         "data_description": {
+          "app_name": "Name of the application as you would like it to be displayed in Home Assistant.",
           "app_id": "E.g. com.plexapp.android for https://play.google.com/store/apps/details?id=com.plexapp.android",
-          "app_icon": "Image URL. From the Play Store app page, right click on the icon and select 'Copy image address' and then paste it here. Alternatively, download the image, upload it under /config/www/ and use the URL /local/filename"
+          "app_icon": "Image URL. From the Play Store app page, right click on the icon and select 'Copy image address' and then paste it here. Alternatively, download the image, upload it under /config/www/ and use the URL /local/filename",
+          "app_delete": "Check this box to delete the application from the list."
         }
       }
     }
diff --git a/homeassistant/components/assist_satellite/__init__.py b/homeassistant/components/assist_satellite/__init__.py
index 26ce9e75428a1a..62dcb8c1d80024 100644
--- a/homeassistant/components/assist_satellite/__init__.py
+++ b/homeassistant/components/assist_satellite/__init__.py
@@ -72,7 +72,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 {
                     vol.Optional("message"): str,
                     vol.Optional("media_id"): _media_id_validator,
-                    vol.Optional("preannounce"): bool,
+                    vol.Optional("preannounce", default=True): bool,
                     vol.Optional("preannounce_media_id"): _media_id_validator,
                 }
             ),
@@ -89,7 +89,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 {
                     vol.Optional("start_message"): str,
                     vol.Optional("start_media_id"): _media_id_validator,
-                    vol.Optional("preannounce"): bool,
+                    vol.Optional("preannounce", default=True): bool,
                     vol.Optional("preannounce_media_id"): _media_id_validator,
                     vol.Optional("extra_system_prompt"): str,
                 }
@@ -114,7 +114,7 @@ async def handle_ask_question(call: ServiceCall) -> dict[str, Any]:
         ask_question_args = {
             "question": call.data.get("question"),
             "question_media_id": call.data.get("question_media_id"),
-            "preannounce": call.data.get("preannounce", False),
+            "preannounce": call.data.get("preannounce", True),
             "answers": call.data.get("answers"),
         }
 
@@ -137,7 +137,7 @@ async def handle_ask_question(call: ServiceCall) -> dict[str, Any]:
                 vol.Required(ATTR_ENTITY_ID): cv.entity_domain(DOMAIN),
                 vol.Optional("question"): str,
                 vol.Optional("question_media_id"): _media_id_validator,
-                vol.Optional("preannounce"): bool,
+                vol.Optional("preannounce", default=True): bool,
                 vol.Optional("preannounce_media_id"): _media_id_validator,
                 vol.Optional("answers"): [
                     {
diff --git a/homeassistant/components/enphase_envoy/__init__.py b/homeassistant/components/enphase_envoy/__init__.py
index eee6cb85e6d1f5..f43d89aa098450 100644
--- a/homeassistant/components/enphase_envoy/__init__.py
+++ b/homeassistant/components/enphase_envoy/__init__.py
@@ -63,6 +63,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: EnphaseConfigEntry) ->
     coordinator = entry.runtime_data
     coordinator.async_cancel_token_refresh()
     coordinator.async_cancel_firmware_refresh()
+    coordinator.async_cancel_mac_verification()
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
diff --git a/homeassistant/components/enphase_envoy/manifest.json b/homeassistant/components/enphase_envoy/manifest.json
index 5f74da954a06ef..8387ecc9c9f6ac 100644
--- a/homeassistant/components/enphase_envoy/manifest.json
+++ b/homeassistant/components/enphase_envoy/manifest.json
@@ -7,7 +7,7 @@
   "iot_class": "local_polling",
   "loggers": ["pyenphase"],
   "quality_scale": "platinum",
-  "requirements": ["pyenphase==2.1.0"],
+  "requirements": ["pyenphase==2.2.0"],
   "zeroconf": [
     {
       "type": "_enphase-envoy._tcp.local."
diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json
index 89ffde03a7f465..01e04df6db8985 100644
--- a/homeassistant/components/esphome/manifest.json
+++ b/homeassistant/components/esphome/manifest.json
@@ -17,7 +17,7 @@
   "mqtt": ["esphome/discover/#"],
   "quality_scale": "platinum",
   "requirements": [
-    "aioesphomeapi==33.1.1",
+    "aioesphomeapi==34.1.0",
     "esphome-dashboard-api==1.3.0",
     "bleak-esphome==2.16.0"
   ],
diff --git a/homeassistant/components/modem_callerid/sensor.py b/homeassistant/components/modem_callerid/sensor.py
index de8e4b2f73c47a..db901511d5f3c7 100644
--- a/homeassistant/components/modem_callerid/sensor.py
+++ b/homeassistant/components/modem_callerid/sensor.py
@@ -4,7 +4,7 @@
 
 from phone_modem import PhoneModem
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import RestoreSensor
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP, STATE_IDLE
 from homeassistant.core import Event, HomeAssistant, callback
@@ -40,7 +40,7 @@ async def _async_on_hass_stop(event: Event) -> None:
     )
 
 
-class ModemCalleridSensor(SensorEntity):
+class ModemCalleridSensor(RestoreSensor):
     """Implementation of USB modem caller ID sensor."""
 
     _attr_should_poll = False
@@ -62,9 +62,21 @@ def __init__(self, api: PhoneModem, server_unique_id: str) -> None:
 
     async def async_added_to_hass(self) -> None:
         """Call when the modem sensor is added to Home Assistant."""
-        self.api.registercallback(self._async_incoming_call)
         await super().async_added_to_hass()
 
+        if (last_state := await self.async_get_last_state()) is not None:
+            self._attr_extra_state_attributes[CID.CID_NAME] = last_state.attributes.get(
+                CID.CID_NAME, ""
+            )
+            self._attr_extra_state_attributes[CID.CID_NUMBER] = (
+                last_state.attributes.get(CID.CID_NUMBER, "")
+            )
+            self._attr_extra_state_attributes[CID.CID_TIME] = last_state.attributes.get(
+                CID.CID_TIME, 0
+            )
+
+        self.api.registercallback(self._async_incoming_call)
+
     @callback
     def _async_incoming_call(self, new_state: str) -> None:
         """Handle new states."""
diff --git a/homeassistant/components/remote_calendar/client.py b/homeassistant/components/remote_calendar/client.py
new file mode 100644
index 00000000000000..f0f243ca386383
--- /dev/null
+++ b/homeassistant/components/remote_calendar/client.py
@@ -0,0 +1,12 @@
+"""Specifies the parameter for the httpx download."""
+
+from httpx import AsyncClient, Response, Timeout
+
+
+async def get_calendar(client: AsyncClient, url: str) -> Response:
+    """Make an HTTP GET request using Home Assistant's async HTTPX client with timeout."""
+    return await client.get(
+        url,
+        follow_redirects=True,
+        timeout=Timeout(5, read=30, write=5, pool=5),
+    )
diff --git a/homeassistant/components/remote_calendar/config_flow.py b/homeassistant/components/remote_calendar/config_flow.py
index 558a3d668aee2a..3f835b5d82b56a 100644
--- a/homeassistant/components/remote_calendar/config_flow.py
+++ b/homeassistant/components/remote_calendar/config_flow.py
@@ -4,13 +4,14 @@
 import logging
 from typing import Any
 
-from httpx import HTTPError, InvalidURL
+from httpx import HTTPError, InvalidURL, TimeoutException
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_URL
 from homeassistant.helpers.httpx_client import get_async_client
 
+from .client import get_calendar
 from .const import CONF_CALENDAR_NAME, DOMAIN
 from .ics import InvalidIcsException, parse_calendar
 
@@ -49,7 +50,7 @@ async def async_step_user(
         self._async_abort_entries_match({CONF_URL: user_input[CONF_URL]})
         client = get_async_client(self.hass)
         try:
-            res = await client.get(user_input[CONF_URL], follow_redirects=True)
+            res = await get_calendar(client, user_input[CONF_URL])
             if res.status_code == HTTPStatus.FORBIDDEN:
                 errors["base"] = "forbidden"
                 return self.async_show_form(
@@ -58,9 +59,14 @@ async def async_step_user(
                     errors=errors,
                 )
             res.raise_for_status()
+        except TimeoutException as err:
+            errors["base"] = "timeout_connect"
+            _LOGGER.debug(
+                "A timeout error occurred: %s", str(err) or type(err).__name__
+            )
         except (HTTPError, InvalidURL) as err:
             errors["base"] = "cannot_connect"
-            _LOGGER.debug("An error occurred: %s", err)
+            _LOGGER.debug("An error occurred: %s", str(err) or type(err).__name__)
         else:
             try:
                 await parse_calendar(self.hass, res.text)
diff --git a/homeassistant/components/remote_calendar/coordinator.py b/homeassistant/components/remote_calendar/coordinator.py
index 1eead7682d3372..26876b532244a7 100644
--- a/homeassistant/components/remote_calendar/coordinator.py
+++ b/homeassistant/components/remote_calendar/coordinator.py
@@ -3,7 +3,7 @@
 from datetime import timedelta
 import logging
 
-from httpx import HTTPError, InvalidURL
+from httpx import HTTPError, InvalidURL, TimeoutException
 from ical.calendar import Calendar
 
 from homeassistant.config_entries import ConfigEntry
@@ -12,6 +12,7 @@
 from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
+from .client import get_calendar
 from .const import DOMAIN
 from .ics import InvalidIcsException, parse_calendar
 
@@ -36,7 +37,7 @@ def __init__(
         super().__init__(
             hass,
             _LOGGER,
-            name=DOMAIN,
+            name=f"{DOMAIN}_{config_entry.title}",
             update_interval=SCAN_INTERVAL,
             always_update=True,
         )
@@ -46,13 +47,19 @@ def __init__(
     async def _async_update_data(self) -> Calendar:
         """Update data from the url."""
         try:
-            res = await self._client.get(self._url, follow_redirects=True)
+            res = await get_calendar(self._client, self._url)
             res.raise_for_status()
+        except TimeoutException as err:
+            _LOGGER.debug("%s: %s", self._url, str(err) or type(err).__name__)
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="timeout",
+            ) from err
         except (HTTPError, InvalidURL) as err:
+            _LOGGER.debug("%s: %s", self._url, str(err) or type(err).__name__)
             raise UpdateFailed(
                 translation_domain=DOMAIN,
                 translation_key="unable_to_fetch",
-                translation_placeholders={"err": str(err)},
             ) from err
         try:
             self.ics = res.text
diff --git a/homeassistant/components/remote_calendar/strings.json b/homeassistant/components/remote_calendar/strings.json
index ef7f20d4699abd..48ef6080bdb612 100644
--- a/homeassistant/components/remote_calendar/strings.json
+++ b/homeassistant/components/remote_calendar/strings.json
@@ -18,14 +18,18 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     },
     "error": {
+      "timeout_connect": "[%key:common::config_flow::error::timeout_connect%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "forbidden": "The server understood the request but refuses to authorize it.",
       "invalid_ics_file": "There was a problem reading the calendar information. See the error log for additional details."
     }
   },
   "exceptions": {
+    "timeout": {
+      "message": "The connection timed out. See the debug log for additional details."
+    },
     "unable_to_fetch": {
-      "message": "Unable to fetch calendar data: {err}"
+      "message": "Unable to fetch calendar data. See the debug log for additional details."
     },
     "unable_to_parse": {
       "message": "Unable to parse calendar data: {err}"
diff --git a/homeassistant/components/russound_rio/manifest.json b/homeassistant/components/russound_rio/manifest.json
index a74a1887836f58..955ab451d3db27 100644
--- a/homeassistant/components/russound_rio/manifest.json
+++ b/homeassistant/components/russound_rio/manifest.json
@@ -7,6 +7,6 @@
   "iot_class": "local_push",
   "loggers": ["aiorussound"],
   "quality_scale": "silver",
-  "requirements": ["aiorussound==4.6.1"],
+  "requirements": ["aiorussound==4.7.0"],
   "zeroconf": ["_rio._tcp.local."]
 }
diff --git a/homeassistant/components/weatherflow_cloud/manifest.json b/homeassistant/components/weatherflow_cloud/manifest.json
index 9ffa457a35597e..d39e373312df7e 100644
--- a/homeassistant/components/weatherflow_cloud/manifest.json
+++ b/homeassistant/components/weatherflow_cloud/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/weatherflow_cloud",
   "iot_class": "cloud_polling",
   "loggers": ["weatherflow4py"],
-  "requirements": ["weatherflow4py==1.3.1"]
+  "requirements": ["weatherflow4py==1.4.1"]
 }
diff --git a/homeassistant/helpers/frame.py b/homeassistant/helpers/frame.py
index ca7b097d90d868..d7a647e02ebb16 100644
--- a/homeassistant/helpers/frame.py
+++ b/homeassistant/helpers/frame.py
@@ -185,6 +185,16 @@ def report_usage(
     """
     if (hass := _hass.hass) is None:
         raise RuntimeError("Frame helper not set up")
+    integration_frame: IntegrationFrame | None = None
+    integration_frame_err: MissingIntegrationFrame | None = None
+    if not integration_domain:
+        try:
+            integration_frame = get_integration_frame(
+                exclude_integrations=exclude_integrations
+            )
+        except MissingIntegrationFrame as err:
+            if core_behavior is ReportBehavior.ERROR:
+                integration_frame_err = err
     _report_usage_partial = functools.partial(
         _report_usage,
         hass,
@@ -193,8 +203,9 @@ def report_usage(
         core_behavior=core_behavior,
         core_integration_behavior=core_integration_behavior,
         custom_integration_behavior=custom_integration_behavior,
-        exclude_integrations=exclude_integrations,
         integration_domain=integration_domain,
+        integration_frame=integration_frame,
+        integration_frame_err=integration_frame_err,
         level=level,
     )
     if hass.loop_thread_id != threading.get_ident():
@@ -212,8 +223,9 @@ def _report_usage(
     core_behavior: ReportBehavior,
     core_integration_behavior: ReportBehavior,
     custom_integration_behavior: ReportBehavior,
-    exclude_integrations: set[str] | None,
     integration_domain: str | None,
+    integration_frame: IntegrationFrame | None,
+    integration_frame_err: MissingIntegrationFrame | None,
     level: int,
 ) -> None:
     """Report incorrect code usage.
@@ -235,12 +247,10 @@ def _report_usage(
         _report_usage_no_integration(what, core_behavior, breaks_in_ha_version, None)
         return
 
-    try:
-        integration_frame = get_integration_frame(
-            exclude_integrations=exclude_integrations
+    if not integration_frame:
+        _report_usage_no_integration(
+            what, core_behavior, breaks_in_ha_version, integration_frame_err
         )
-    except MissingIntegrationFrame as err:
-        _report_usage_no_integration(what, core_behavior, breaks_in_ha_version, err)
         return
 
     integration_behavior = core_integration_behavior
diff --git a/homeassistant/helpers/trigger.py b/homeassistant/helpers/trigger.py
index 66d1560ac70a2a..57ee6b99029463 100644
--- a/homeassistant/helpers/trigger.py
+++ b/homeassistant/helpers/trigger.py
@@ -147,11 +147,15 @@ async def _register_trigger_platform(
         )
         return
 
-    tasks: list[asyncio.Task[None]] = [
-        create_eager_task(listener(new_triggers))
-        for listener in hass.data[TRIGGER_PLATFORM_SUBSCRIPTIONS]
-    ]
-    await asyncio.gather(*tasks)
+    # We don't use gather here because gather adds additional overhead
+    # when wrapping each coroutine in a task, and we expect our listeners
+    # to call trigger.async_get_all_descriptions which will only yield
+    # the first time it's called, after that it returns cached data.
+    for listener in hass.data[TRIGGER_PLATFORM_SUBSCRIPTIONS]:
+        try:
+            await listener(new_triggers)
+        except Exception:
+            _LOGGER.exception("Error while notifying trigger platform listener")
 
 
 class Trigger(abc.ABC):
diff --git a/requirements_all.txt b/requirements_all.txt
index 588508c3a36d72..4b622fe9c354b3 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -247,7 +247,7 @@ aioelectricitymaps==0.4.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==33.1.1
+aioesphomeapi==34.1.0
 
 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -372,7 +372,7 @@ aioridwell==2024.01.0
 aioruckus==0.42
 
 # homeassistant.components.russound_rio
-aiorussound==4.6.1
+aiorussound==4.7.0
 
 # homeassistant.components.ruuvi_gateway
 aioruuvigateway==0.1.0
@@ -477,7 +477,7 @@ amcrest==1.9.8
 androidtv[async]==0.0.75
 
 # homeassistant.components.androidtv_remote
-androidtvremote2==0.2.2
+androidtvremote2==0.2.3
 
 # homeassistant.components.anel_pwrctrl
 anel-pwrctrl-homeassistant==0.0.1.dev2
@@ -1962,7 +1962,7 @@ pyeiscp==0.0.7
 pyemoncms==0.1.1
 
 # homeassistant.components.enphase_envoy
-pyenphase==2.1.0
+pyenphase==2.2.0
 
 # homeassistant.components.envisalink
 pyenvisalink==4.7
@@ -3084,7 +3084,7 @@ waterfurnace==1.1.0
 watergate-local-api==2024.4.1
 
 # homeassistant.components.weatherflow_cloud
-weatherflow4py==1.3.1
+weatherflow4py==1.4.1
 
 # homeassistant.components.cisco_webex_teams
 webexpythonsdk==2.0.1
diff --git a/requirements_test.txt b/requirements_test.txt
index 4b2b7ec49097f3..386e380911a1f3 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -11,7 +11,7 @@ astroid==3.3.10
 coverage==7.9.1
 freezegun==1.5.2
 go2rtc-client==0.2.1
-license-expression==30.4.1
+license-expression==30.4.3
 mock-open==1.4.0
 mypy-dev==1.17.0a4
 pre-commit==4.2.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index a82b835cfde6eb..4fbebe1bf9edf0 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -235,7 +235,7 @@ aioelectricitymaps==0.4.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==33.1.1
+aioesphomeapi==34.1.0
 
 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -354,7 +354,7 @@ aioridwell==2024.01.0
 aioruckus==0.42
 
 # homeassistant.components.russound_rio
-aiorussound==4.6.1
+aiorussound==4.7.0
 
 # homeassistant.components.ruuvi_gateway
 aioruuvigateway==0.1.0
@@ -453,7 +453,7 @@ amberelectric==2.0.12
 androidtv[async]==0.0.75
 
 # homeassistant.components.androidtv_remote
-androidtvremote2==0.2.2
+androidtvremote2==0.2.3
 
 # homeassistant.components.anova
 anova-wifi==0.17.0
@@ -1637,7 +1637,7 @@ pyeiscp==0.0.7
 pyemoncms==0.1.1
 
 # homeassistant.components.enphase_envoy
-pyenphase==2.1.0
+pyenphase==2.2.0
 
 # homeassistant.components.everlights
 pyeverlights==0.1.0
@@ -2543,7 +2543,7 @@ watchdog==6.0.0
 watergate-local-api==2024.4.1
 
 # homeassistant.components.weatherflow_cloud
-weatherflow4py==1.3.1
+weatherflow4py==1.4.1
 
 # homeassistant.components.nasweb
 webio-api==0.1.11
diff --git a/script/licenses.py b/script/licenses.py
index 3330d99b4a5fe8..6d5f7e58f2f5c2 100644
--- a/script/licenses.py
+++ b/script/licenses.py
@@ -205,11 +205,17 @@ def from_dict(cls, data: PackageMetadata) -> PackageDefinition:
     "tapsaff",  # https://github.com/bazwilliams/python-taps-aff/pull/5
 }
 
+# fmt: off
 TODO = {
+    "TravisPy": AwesomeVersion("0.3.5"),  # None -- GPL -- ['GNU General Public License v3 (GPLv3)']
     "aiocache": AwesomeVersion(
         "0.12.3"
     ),  # https://github.com/aio-libs/aiocache/blob/master/LICENSE all rights reserved?
+    "caldav": AwesomeVersion("1.6.0"),  # None -- GPL -- ['GNU General Public License (GPL)', 'Apache Software License']  # https://github.com/python-caldav/caldav
+    "pyiskra": AwesomeVersion("0.1.21"),  # None -- GPL -- ['GNU General Public License v3 (GPLv3)']
+    "xbox-webapi": AwesomeVersion("2.1.0"),  # None -- GPL -- ['MIT License']
 }
+# fmt: on
 
 EXCEPTIONS_AND_TODOS = EXCEPTIONS.union(TODO)
 
diff --git a/tests/components/androidtv_remote/test_config_flow.py b/tests/components/androidtv_remote/test_config_flow.py
index 0968ea5acff980..9652ac0c3a92f9 100644
--- a/tests/components/androidtv_remote/test_config_flow.py
+++ b/tests/components/androidtv_remote/test_config_flow.py
@@ -1069,3 +1069,100 @@ async def test_options_flow(
     )
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert mock_config_entry.options == {CONF_ENABLE_IME: True}
+
+
+async def test_reconfigure_flow_success(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_setup_entry: AsyncMock,
+    mock_api: MagicMock,
+) -> None:
+    """Test the full reconfigure flow from start to finish without any exceptions."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await mock_config_entry.start_reconfigure_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+    assert not result["errors"]
+    assert "host" in result["data_schema"].schema
+    # Form should have as default value the existing host
+    host_key = next(k for k in result["data_schema"].schema if k.schema == "host")
+    assert host_key.default() == mock_config_entry.data["host"]
+
+    mock_api.async_generate_cert_if_missing = AsyncMock(return_value=True)
+    mock_api.async_get_name_and_mac = AsyncMock(
+        return_value=(mock_config_entry.data["name"], mock_config_entry.data["mac"])
+    )
+
+    # Simulate user input with a new host
+    new_host = "4.3.2.1"
+    assert new_host != mock_config_entry.data["host"]
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"host": new_host}
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reconfigure_successful"
+    assert mock_config_entry.data["host"] == new_host
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_reconfigure_flow_cannot_connect(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_setup_entry: AsyncMock,
+    mock_api: MagicMock,
+) -> None:
+    """Test reconfigure flow with CannotConnect exception."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await mock_config_entry.start_reconfigure_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+
+    mock_api.async_generate_cert_if_missing = AsyncMock(return_value=True)
+    mock_api.async_get_name_and_mac = AsyncMock(side_effect=CannotConnect())
+
+    new_host = "4.3.2.1"
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"host": new_host}
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+    assert result["errors"] == {"base": "cannot_connect"}
+    assert mock_config_entry.data["host"] == "1.2.3.4"
+    assert len(mock_setup_entry.mock_calls) == 0
+
+
+async def test_reconfigure_flow_unique_id_mismatch(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_setup_entry: AsyncMock,
+    mock_api: MagicMock,
+) -> None:
+    """Test reconfigure flow with a different device (unique_id mismatch)."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await mock_config_entry.start_reconfigure_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "reconfigure"
+
+    mock_api.async_generate_cert_if_missing = AsyncMock(return_value=True)
+    # The new host corresponds to a device with a different MAC/unique_id
+    new_mac = "FF:EE:DD:CC:BB:AA"
+    assert new_mac != mock_config_entry.data["mac"]
+    mock_api.async_get_name_and_mac = AsyncMock(return_value=("name", new_mac))
+
+    new_host = "4.3.2.1"
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"host": new_host}
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "unique_id_mismatch"
+    assert mock_config_entry.data["host"] == "1.2.3.4"
+    assert len(mock_setup_entry.mock_calls) == 0
diff --git a/tests/components/assist_satellite/test_entity.py b/tests/components/assist_satellite/test_entity.py
index 9f14be6c50ff25..4b7a11edfeec73 100644
--- a/tests/components/assist_satellite/test_entity.py
+++ b/tests/components/assist_satellite/test_entity.py
@@ -793,12 +793,19 @@ async def async_start_conversation(start_announcement):
 
 
 @pytest.mark.parametrize(
-    ("service_data", "response_text", "expected_answer"),
+    ("service_data", "response_text", "expected_answer", "should_preannounce"),
     [
+        (
+            {},
+            "jazz",
+            AssistSatelliteAnswer(id=None, sentence="jazz"),
+            True,
+        ),
         (
             {"preannounce": False},
             "jazz",
             AssistSatelliteAnswer(id=None, sentence="jazz"),
+            False,
         ),
         (
             {
@@ -810,6 +817,7 @@ async def async_start_conversation(start_announcement):
             },
             "Some Rock, please.",
             AssistSatelliteAnswer(id="rock", sentence="Some Rock, please."),
+            False,
         ),
         (
             {
@@ -827,7 +835,7 @@ async def async_start_conversation(start_announcement):
                         "sentences": ["artist {artist} [please]"],
                     },
                 ],
-                "preannounce": False,
+                "preannounce": True,
             },
             "artist Pink Floyd",
             AssistSatelliteAnswer(
@@ -835,6 +843,7 @@ async def async_start_conversation(start_announcement):
                 sentence="artist Pink Floyd",
                 slots={"artist": "Pink Floyd"},
             ),
+            True,
         ),
     ],
 )
@@ -845,6 +854,7 @@ async def test_ask_question(
     service_data: dict,
     response_text: str,
     expected_answer: AssistSatelliteAnswer,
+    should_preannounce: bool,
 ) -> None:
     """Test asking a question on a device and matching an answer."""
     entity_id = "assist_satellite.test_entity"
@@ -868,6 +878,9 @@ async def speech_to_text(self, *args, **kwargs):
     async def async_start_conversation(start_announcement):
         # Verify state change
         assert entity.state == AssistSatelliteState.RESPONDING
+        assert (
+            start_announcement.preannounce_media_id is not None
+        ) is should_preannounce
         await original_start_conversation(start_announcement)
 
         audio_stream = object()
diff --git a/tests/components/esphome/snapshots/test_diagnostics.ambr b/tests/components/esphome/snapshots/test_diagnostics.ambr
index dac224c802f627..6b7a1c64c9fd67 100644
--- a/tests/components/esphome/snapshots/test_diagnostics.ambr
+++ b/tests/components/esphome/snapshots/test_diagnostics.ambr
@@ -82,6 +82,7 @@
         'minor': 99,
       }),
       'device_info': dict({
+        'api_encryption_supported': False,
         'area': dict({
           'area_id': 0,
           'name': '',
diff --git a/tests/components/esphome/test_diagnostics.py b/tests/components/esphome/test_diagnostics.py
index 2653df57adb708..ebfe15d562f467 100644
--- a/tests/components/esphome/test_diagnostics.py
+++ b/tests/components/esphome/test_diagnostics.py
@@ -124,6 +124,7 @@ async def test_diagnostics_with_bluetooth(
         "storage_data": {
             "api_version": {"major": 99, "minor": 99},
             "device_info": {
+                "api_encryption_supported": False,
                 "area": {"area_id": 0, "name": ""},
                 "areas": [],
                 "bluetooth_mac_address": "**REDACTED**",
diff --git a/tests/components/ezviz/test_config_flow.py b/tests/components/ezviz/test_config_flow.py
index 20d70902e83447..ff34134b3fba71 100644
--- a/tests/components/ezviz/test_config_flow.py
+++ b/tests/components/ezviz/test_config_flow.py
@@ -129,6 +129,7 @@ async def test_async_step_reauth(
             CONF_PASSWORD: "test-password",
         },
     )
+    await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "reauth_successful"
@@ -639,6 +640,7 @@ async def test_reauth_errors(
             CONF_PASSWORD: "test-password",
         },
     )
+    await hass.async_block_till_done()
 
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "reauth_successful"
diff --git a/tests/components/remote_calendar/test_config_flow.py b/tests/components/remote_calendar/test_config_flow.py
index 9aff1594db32ea..9bea46ab27e647 100644
--- a/tests/components/remote_calendar/test_config_flow.py
+++ b/tests/components/remote_calendar/test_config_flow.py
@@ -1,6 +1,6 @@
 """Test the Remote Calendar config flow."""
 
-from httpx import ConnectError, Response, UnsupportedProtocol
+from httpx import HTTPError, InvalidURL, Response, TimeoutException
 import pytest
 import respx
 
@@ -75,10 +75,11 @@ async def test_form_import_webcal(hass: HomeAssistant, ics_content: str) -> None
 
 
 @pytest.mark.parametrize(
-    ("side_effect"),
+    ("side_effect", "base_error"),
     [
-        ConnectError("Connection failed"),
-        UnsupportedProtocol("Unsupported protocol"),
+        (TimeoutException("Connection timed out"), "timeout_connect"),
+        (HTTPError("Connection failed"), "cannot_connect"),
+        (InvalidURL("Unsupported protocol"), "cannot_connect"),
     ],
 )
 @respx.mock
@@ -86,6 +87,7 @@ async def test_form_inavild_url(
     hass: HomeAssistant,
     side_effect: Exception,
     ics_content: str,
+    base_error: str,
 ) -> None:
     """Test we get the import form."""
     result = await hass.config_entries.flow.async_init(
@@ -102,7 +104,7 @@ async def test_form_inavild_url(
         },
     )
     assert result2["type"] is FlowResultType.FORM
-    assert result2["errors"] == {"base": "cannot_connect"}
+    assert result2["errors"] == {"base": base_error}
     respx.get(CALENDER_URL).mock(
         return_value=Response(
             status_code=200,
diff --git a/tests/components/remote_calendar/test_init.py b/tests/components/remote_calendar/test_init.py
index f4ca500b2e17e3..d3e6b439805e95 100644
--- a/tests/components/remote_calendar/test_init.py
+++ b/tests/components/remote_calendar/test_init.py
@@ -1,6 +1,6 @@
 """Tests for init platform of Remote Calendar."""
 
-from httpx import ConnectError, Response, UnsupportedProtocol
+from httpx import HTTPError, InvalidURL, Response, TimeoutException
 import pytest
 import respx
 
@@ -56,8 +56,9 @@ async def test_raise_for_status(
 @pytest.mark.parametrize(
     "side_effect",
     [
-        ConnectError("Connection failed"),
-        UnsupportedProtocol("Unsupported protocol"),
+        TimeoutException("Connection timed out"),
+        HTTPError("Connection failed"),
+        InvalidURL("Unsupported protocol"),
         ValueError("Invalid response"),
     ],
 )
diff --git a/tests/components/tuya/common.py b/tests/components/tuya/common.py
deleted file mode 100644
index 8dcef136b7f4c3..00000000000000
--- a/tests/components/tuya/common.py
+++ /dev/null
@@ -1,75 +0,0 @@
-"""Test code shared between test files."""
-
-from tuyaha.devices import climate, light, switch
-
-CLIMATE_ID = "1"
-CLIMATE_DATA = {
-    "data": {"state": "true", "temp_unit": climate.UNIT_CELSIUS},
-    "id": CLIMATE_ID,
-    "ha_type": "climate",
-    "name": "TestClimate",
-    "dev_type": "climate",
-}
-
-LIGHT_ID = "2"
-LIGHT_DATA = {
-    "data": {"state": "true"},
-    "id": LIGHT_ID,
-    "ha_type": "light",
-    "name": "TestLight",
-    "dev_type": "light",
-}
-
-SWITCH_ID = "3"
-SWITCH_DATA = {
-    "data": {"state": True},
-    "id": SWITCH_ID,
-    "ha_type": "switch",
-    "name": "TestSwitch",
-    "dev_type": "switch",
-}
-
-LIGHT_ID_FAKE1 = "9998"
-LIGHT_DATA_FAKE1 = {
-    "data": {"state": "true"},
-    "id": LIGHT_ID_FAKE1,
-    "ha_type": "light",
-    "name": "TestLightFake1",
-    "dev_type": "light",
-}
-
-LIGHT_ID_FAKE2 = "9999"
-LIGHT_DATA_FAKE2 = {
-    "data": {"state": "true"},
-    "id": LIGHT_ID_FAKE2,
-    "ha_type": "light",
-    "name": "TestLightFake2",
-    "dev_type": "light",
-}
-
-TUYA_DEVICES = [
-    climate.TuyaClimate(CLIMATE_DATA, None),
-    light.TuyaLight(LIGHT_DATA, None),
-    switch.TuyaSwitch(SWITCH_DATA, None),
-    light.TuyaLight(LIGHT_DATA_FAKE1, None),
-    light.TuyaLight(LIGHT_DATA_FAKE2, None),
-]
-
-
-class MockTuya:
-    """Mock for Tuya devices."""
-
-    def get_all_devices(self):
-        """Return all configured devices."""
-        return TUYA_DEVICES
-
-    def get_device_by_id(self, dev_id):
-        """Return configured device with dev id."""
-        if dev_id == LIGHT_ID_FAKE1:
-            return None
-        if dev_id == LIGHT_ID_FAKE2:
-            return switch.TuyaSwitch(SWITCH_DATA, None)
-        for device in TUYA_DEVICES:
-            if device.object_id() == dev_id:
-                return device
-        return None
diff --git a/tests/helpers/test_trigger.py b/tests/helpers/test_trigger.py
index 27cde92d14ff24..ba9db9cb053646 100644
--- a/tests/helpers/test_trigger.py
+++ b/tests/helpers/test_trigger.py
@@ -738,3 +738,45 @@ async def test_invalid_trigger_platform(
     await async_setup_component(hass, "test", {})
 
     assert "Integration test does not provide trigger support, skipping" in caplog.text
+
+
+@patch("annotatedyaml.loader.load_yaml")
+@patch.object(Integration, "has_triggers", return_value=True)
+async def test_subscribe_triggers(
+    mock_has_triggers: Mock,
+    mock_load_yaml: Mock,
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test trigger.async_subscribe_platform_events."""
+    sun_trigger_descriptions = """
+        sun: {}
+        """
+
+    def _load_yaml(fname, secrets=None):
+        if fname.endswith("sun/triggers.yaml"):
+            trigger_descriptions = sun_trigger_descriptions
+        else:
+            raise FileNotFoundError
+        with io.StringIO(trigger_descriptions) as file:
+            return parse_yaml(file)
+
+    mock_load_yaml.side_effect = _load_yaml
+
+    async def broken_subscriber(_):
+        """Simulate a broken subscriber."""
+        raise Exception("Boom!")  # noqa: TRY002
+
+    trigger_events = []
+
+    async def good_subscriber(new_triggers: set[str]):
+        """Simulate a working subscriber."""
+        trigger_events.append(new_triggers)
+
+    trigger.async_subscribe_platform_events(hass, broken_subscriber)
+    trigger.async_subscribe_platform_events(hass, good_subscriber)
+
+    assert await async_setup_component(hass, "sun", {})
+
+    assert trigger_events == [{"sun"}]
+    assert "Error while notifying trigger platform listener" in caplog.text