diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk
index 71ad5ab..43d9198 100644
--- a/bluetooth/syna_default.mk
+++ b/bluetooth/syna_default.mk
@@ -18,12 +18,12 @@
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.bluetooth.leaudio_switcher.supported=true \
-    bluetooth.profile.bap.unicast.client.enabled=true \
-    bluetooth.profile.csip.set_coordinator.enabled=true \
-    bluetooth.profile.hap.client.enabled=true \
-    bluetooth.profile.mcp.server.enabled=true \
-    bluetooth.profile.ccp.server.enabled=true \
-    bluetooth.profile.vcp.controller.enabled=true \
+    bluetooth.profile.bap.unicast.client.enabled?=true \
+    bluetooth.profile.csip.set_coordinator.enabled?=true \
+    bluetooth.profile.hap.client.enabled?=true \
+    bluetooth.profile.mcp.server.enabled?=true \
+    bluetooth.profile.ccp.server.enabled?=true \
+    bluetooth.profile.vcp.controller.enabled?=true \
 
 # Bluetooth HAL and Pixel extension
 DEVICE_MANIFEST_FILE += \
diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index ad6d82b..a6405bc 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -569,6 +569,14 @@
         <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
     </integer-array>
 
+    <!-- Override the "touch slop" value used by ViewConfiguration.
+        This prevents misclassification of gestures as long presses, by reducing the
+        distance that the pointer can travel while still being treated as "stationary".
+        The default value is 8dp, which is roughly 1.5mm on this device. On another
+        reference device, the touch slop was estimated at ~ 1 mm. Therefore, set the
+        touch slop to 8/1.5 =~ 5 dp to make it closer to the reference device. -->
+   <dimen name="config_viewConfigurationTouchSlop">5dp</dimen>
+
     <!-- The default volume for the notification stream -->
     <integer name="config_audio_notif_vol_default">0</integer>