Sync with upstream

1bd621b1

automations/maybe-an-earthquake.yaml

@@ -27,7 +27,7 @@ action:
       - scene.da_bright
       - scene.lr_bright
       - scene.office_bright
-      - scene.ericks_desk_lamp_relax
+      - scene.erick_s_desk_lamp_relax
       - scene.master_bedroom_bright
       - scene.master_bath_bright
       - scene.balcony_bright