Merge branch 'main' into sam/persistent-pixels

* main:
  Update BSK version to support userTips NetP Flag (#3416)
  Release 7.140.0-0 (#3418)
  Adds new debug screen to view raw credentials data (#3400)
  Bump rollup from 2.79.1 to 3.29.5 (#3385)
  fix UI tests broken by tabs suggestions (#3402)
  Fix ability to edit Synced device name (#3404)
  Fix failing password-management maestro test (#3413)

.maestro/release_tests/bookmarks.yaml

@@ -34,6 +34,7 @@ tags:
 - assertVisible: "Privacy Test Pages - Home"
 - assertVisible: "privacy-test-pages.site"
 - tapOn: "Privacy Test Pages - Home"
+- tapOn: "Refresh Page"
 
 # Verify site has been bookmarked
 - assertVisible: "Browsing menu"

.maestro/release_tests/firebutton.yaml

@@ -36,17 +36,21 @@ tags:
 - inputText: "https://example.com"
 - pressKey: Enter
 
-# Check history
-- longPressOn: "Tab Switcher"
+# Close tab
+- tapOn: "Tab Switcher"
+- tapOn: "Close \"Example Domain\" at example.com"
+- tapOn:
+    id: "Add"
 
+# Check history
 - assertVisible:
     id: "searchEntry"
 - tapOn: 
     id: "searchEntry"
 - inputText: "ex"
 - assertVisible: "example.com"
 - assertVisible: "Example Domain"
-- tapOn: "Cancel"
+- tapOn: "Example Domain"
 
 # Fire button
 - tapOn: "Close Tabs and Clear Data"

Configuration/Version.xcconfig

@@ -1 +1 @@
-MARKETING_VERSION = 7.139.0
+MARKETING_VERSION = 7.140.0

Core/AppPrivacyConfigurationDataProvider.swift

@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"aa6acaab3804053c652b64a3568cee2b\""
-        public static let embeddedDataSHA = "d56a1b7ff72713333d2d17e6825a6ab8f14d3f87b4b77c2406d74840d393960b"
+        public static let embeddedDataETag = "\"6330c36f7ff354d26f32ee951e0a972e\""
+        public static let embeddedDataSHA = "40f77d6db1db544f06740b3290c5a72e5f03f706d17c9c0e05b13cd9255f2778"
     }
 
     public var embeddedDataEtag: String {

Core/AppTrackerDataSetProvider.swift

@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppTrackerDataSetProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"4f9b48a36688eee92064578bc1aebe0a\""
-        public static let embeddedDataSHA = "ee51cab5fd4b82e6751a3d94680c89d4e248e0d456650b443f115998e1d3bec3"
+        public static let embeddedDataETag = "\"f5dad10599a8d6088ec1908da3eeb3cc\""
+        public static let embeddedDataSHA = "bb4c80f41383971693b241b4580fa74bbec1378ca6c2f8da8745dc6044fa1af9"
     }
 
     public var embeddedDataEtag: String {

Core/FeatureFlag.swift

@@ -43,6 +43,9 @@ public enum FeatureFlag: String {
     case onboardingHighlights
     case autofillSurveys
     case autcompleteTabs
+
+    /// https://app.asana.com/0/72649045549333/1208231259093710/f
+    case networkProtectionUserTips
 }
 
 extension FeatureFlag: FeatureFlagSourceProviding {
@@ -92,6 +95,8 @@ extension FeatureFlag: FeatureFlagSourceProviding {
             return .remoteReleasable(.feature(.autofillSurveys))
         case .autcompleteTabs:
             return .remoteReleasable(.feature(.autocompleteTabs))
+        case .networkProtectionUserTips:
+            return .remoteReleasable(.subfeature(NetworkProtectionSubfeature.userTips))
         }
     }
 }