diff --git a/NVTCapacitivePen.idc b/NVTCapacitivePen.idc
index 39f5158..698d0db 100644
--- a/NVTCapacitivePen.idc
+++ b/NVTCapacitivePen.idc
@@ -1,2 +1,2 @@
 touch.orientationAware = 1
-touch.orientation = ORIENTATION_270
+touch.orientation = ORIENTATION_0
diff --git a/NVTCapacitiveTouchScreen.idc b/NVTCapacitiveTouchScreen.idc
index bcfcb54..5c2afd6 100644
--- a/NVTCapacitiveTouchScreen.idc
+++ b/NVTCapacitiveTouchScreen.idc
@@ -1 +1 @@
-touch.orientation = ORIENTATION_270
+touch.orientation = ORIENTATION_0
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 5896ff8..13aa7e6 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -146,6 +146,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Set ro.crypto.metadata_init_delete_all_keys.enabled to false to unblock boot
 PRODUCT_PROPERTY_OVERRIDES += ro.crypto.metadata_init_delete_all_keys.enabled=false
 
+# Temporary override to synchronise changes in pa/ and ag/. See b/246793311 for context.
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.primary_display_orientation=ORIENTATION_0
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.ignore_hwc_physical_display_orientation=true
+
 # Display white balance
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
         ro.surface_flinger.display_primary_red=0.5128,0.2413,0.0000 \