diff --git a/changelog.d/3646.feature b/changelog.d/3646.feature
new file mode 100644
index 0000000000..ba2e870052
--- /dev/null
+++ b/changelog.d/3646.feature
@@ -0,0 +1 @@
+Reorganise Advanced Notifications in to Global Notifications, Keywords and Mentions, Other (This feature is hidden in the release ui until a future release date.)
\ No newline at end of file
diff --git a/vector/build.gradle b/vector/build.gradle
index eaf70e50b1..dabdcfb4dc 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -142,6 +142,7 @@ android {
         resValue "bool", "useLoginV1", "true"
         resValue "bool", "useLoginV2", "false"
 
+        // NotificationSettingsV2 is disabled. To be released in conjunction with iOS/Web
         resValue "bool", "useNotificationSettingsV1", "true"
         resValue "bool", "useNotificationSettingsV2", "false"
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGlobalNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGlobalNotificationPreferenceFragment.kt
index 7e6f51f0b6..b9ac089158 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGlobalNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGlobalNotificationPreferenceFragment.kt
@@ -34,4 +34,3 @@ class VectorSettingsGlobalNotificationPreferenceFragment
                 "SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_GROUP_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ENCRYPTED
         )
 }
-
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
index 2bf0a7c0ed..b2a1d26fc8 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
@@ -19,7 +19,6 @@ package im.vector.app.features.settings
 import im.vector.app.R
 import org.matrix.android.sdk.api.pushrules.RuleIds
 
-
 class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
     : VectorSettingsPushRuleNotificationPreferenceFragment() {
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPushRuleNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPushRuleNotificationPreferenceFragment.kt
index 6683cf3038..705d90a8c9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPushRuleNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPushRuleNotificationPreferenceFragment.kt
@@ -138,5 +138,4 @@ abstract class VectorSettingsPushRuleNotificationPreferenceFragment
     }
 
     abstract val prefKeyToPushRuleId: Map<String, String>
-
 }
diff --git a/vector/src/main/res/xml/vector_settings_notification_global.xml b/vector/src/main/res/xml/vector_settings_notification_global.xml
index 70defb32c4..64d0c131b7 100644
--- a/vector/src/main/res/xml/vector_settings_notification_global.xml
+++ b/vector/src/main/res/xml/vector_settings_notification_global.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_OTHER"
         android:title="@string/settings_notification_notify_me_for">
@@ -25,4 +25,4 @@
             android:title="@string/settings_encrypted_group_messages" />
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml b/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml
index 18de36cb52..be89c86cb1 100644
--- a/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml
+++ b/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_KEYWORDS_AND_MENTIONS"
         android:title="@string/settings_notification_notify_me_for">
@@ -20,4 +20,4 @@
             android:title="@string/settings_messages_at_room" />
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_notification_other.xml b/vector/src/main/res/xml/vector_settings_notification_other.xml
index ad2b5194f0..b15329635c 100644
--- a/vector/src/main/res/xml/vector_settings_notification_other.xml
+++ b/vector/src/main/res/xml/vector_settings_notification_other.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_OTHER"
         android:title="@string/settings_notification_notify_me_for">
@@ -24,4 +24,4 @@
             android:persistent="false"
             android:title="@string/settings_room_upgrades" />
     </im.vector.app.core.preference.VectorPreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file