diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 23c387961a..b419658e78 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1580,7 +1580,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             showVoiceMessageUI()
             window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
             audioRecorder.startRecording()
-            stopAudioHandler.postDelayed(stopVoiceMessageRecordingTask, 60000) // Limit voice messages to 1 minute each
+            stopAudioHandler.postDelayed(stopVoiceMessageRecordingTask, 300000) // Limit voice messages to 5 minute each
         } else {
             Permissions.with(this)
                 .request(Manifest.permission.RECORD_AUDIO)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsLayout.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsLayout.kt
deleted file mode 100644
index ed2970fbc4..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsLayout.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.thoughtcrime.securesms.preferences
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.FrameLayout
-
-class BlockedContactsLayout @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : FrameLayout(context, attrs)
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
index e985ba6d4f..48c7cc6dc8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.preferences
 import android.content.Context
 import android.content.Intent
 import android.util.AttributeSet
-import android.view.View
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceViewHolder
 
@@ -16,8 +15,7 @@ class BlockedContactsPreference @JvmOverloads constructor(
         super.onBindViewHolder(holder)
 
         holder.itemView.setOnClickListener {
-            val intent = Intent(context, BlockedContactsActivity::class.java)
-            context.startActivity(intent)
+            Intent(context, BlockedContactsActivity::class.java).let(context::startActivity)
         }
     }
 }
diff --git a/app/src/main/res/layout/blocked_contacts_preference.xml b/app/src/main/res/layout/blocked_contacts_preference.xml
index 83fe432cf9..673d5316a1 100644
--- a/app/src/main/res/layout/blocked_contacts_preference.xml
+++ b/app/src/main/res/layout/blocked_contacts_preference.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.preferences.BlockedContactsLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:contentDescription="@string/AccessibilityId_blocked_contacts"
+    style="@style/Widget.Session.Button.Common.Borderless"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="@dimen/medium_spacing"
     android:layout_marginHorizontal="@dimen/large_spacing"
     android:layout_marginVertical="@dimen/medium_spacing"
-    android:layout_height="wrap_content">
-    <Button
-        android:contentDescription="@string/AccessibilityId_blocked_contacts"
-        style="@style/Widget.Session.Button.Common.Borderless"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/medium_spacing"
-        android:text="@string/blocked_contacts_title"
-        android:textColor="@color/destructive"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        />
-</org.thoughtcrime.securesms.preferences.BlockedContactsLayout>
+    android:text="@string/blocked_contacts_title"
+    android:textColor="@color/destructive"
+    android:textSize="16sp"
+    android:textStyle="bold"
+/>
diff --git a/app/src/main/res/xml/preferences_app_protection.xml b/app/src/main/res/xml/preferences_app_protection.xml
index 0a7a15f70e..6119719930 100644
--- a/app/src/main/res/xml/preferences_app_protection.xml
+++ b/app/src/main/res/xml/preferences_app_protection.xml
@@ -14,7 +14,7 @@
 
         <!-- TODO: check figure out what is needed for this -->
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-            android:defaultValue="true"
+            android:defaultValue="@bool/screen_security_default"
             android:key="pref_screen_security"
             android:title="@string/preferences__screen_security"
             android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
diff --git a/libsession/src/debug/res/values/values.xml b/libsession/src/debug/res/values/values.xml
new file mode 100644
index 0000000000..207edfc843
--- /dev/null
+++ b/libsession/src/debug/res/values/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="screen_security_default">false</bool>
+</resources>
diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
index 1f05e4f135..807c40b43b 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
@@ -649,7 +649,7 @@ interface TextSecurePreferences {
 
         @JvmStatic
         fun isScreenSecurityEnabled(context: Context): Boolean {
-            return getBooleanPreference(context, SCREEN_SECURITY_PREF, !BuildConfig.DEBUG)
+            return getBooleanPreference(context, SCREEN_SECURITY_PREF, context.resources.getBoolean(R.bool.screen_security_default))
         }
 
         fun getLastVersionCode(context: Context): Int {
diff --git a/libsession/src/main/res/values/values.xml b/libsession/src/main/res/values/values.xml
index 369e27339a..f493249a83 100644
--- a/libsession/src/main/res/values/values.xml
+++ b/libsession/src/main/res/values/values.xml
@@ -2,4 +2,5 @@
 <resources>
     <bool name="enable_alarm_manager">true</bool>
     <bool name="enable_job_service">false</bool>
+    <bool name="screen_security_default">true</bool>
 </resources>