diff --git a/app/src/main/java/org/obd/graphs/activity/Receivers.kt b/app/src/main/java/org/obd/graphs/activity/Receivers.kt
index f979724d..4e32cb16 100644
--- a/app/src/main/java/org/obd/graphs/activity/Receivers.kt
+++ b/app/src/main/java/org/obd/graphs/activity/Receivers.kt
@@ -45,6 +45,7 @@ import org.obd.graphs.R
 import org.obd.graphs.REQUEST_LOCATION_PERMISSIONS
 import org.obd.graphs.REQUEST_NOTIFICATION_PERMISSIONS
 import org.obd.graphs.REQUEST_PERMISSIONS_BT
+import org.obd.graphs.SCREEN_LOCK_DIALOG_CANCELLED_EVENT
 import org.obd.graphs.SCREEN_LOCK_PROGRESS_EVENT
 import org.obd.graphs.SCREEN_OFF_EVENT
 import org.obd.graphs.SCREEN_ON_EVENT
@@ -72,13 +73,14 @@ import org.obd.graphs.bl.extra.EVENT_VEHICLE_STATUS_VEHICLE_DECELERATING
 import org.obd.graphs.bl.extra.EVENT_VEHICLE_STATUS_VEHICLE_IDLING
 import org.obd.graphs.bl.extra.EVENT_VEHICLE_STATUS_VEHICLE_RUNNING
 import org.obd.graphs.getContext
-import org.obd.graphs.getExtraParam
+import org.obd.graphs.getMessageExtraParam
 import org.obd.graphs.preferences.PREFS_CONNECTION_TYPE_CHANGED_EVENT
 import org.obd.graphs.preferences.Prefs
 import org.obd.graphs.preferences.isEnabled
 import org.obd.graphs.preferences.profile.PROFILE_NAME_CHANGED_EVENT
 import org.obd.graphs.profile.PROFILE_CHANGED_EVENT
 import org.obd.graphs.registerReceiver
+import org.obd.graphs.sendBroadcastEvent
 import org.obd.graphs.ui.common.COLOR_CARDINAL
 import org.obd.graphs.ui.common.COLOR_PHILIPPINE_GREEN
 import org.obd.graphs.ui.common.toast
@@ -145,12 +147,15 @@ internal fun MainActivity.receive(intent: Intent?) {
         }
 
         SCREEN_UNLOCK_PROGRESS_EVENT -> screenLockManager.dismiss()
+
         SCREEN_LOCK_PROGRESS_EVENT -> {
-            var msg = intent.getExtraParam()
-            if (msg.isEmpty()) {
-                msg = getText(R.string.dialog_screen_lock_message) as String
+            var msg = intent.getMessageExtraParam()
+            if (msg == null || msg.isEmpty()) {
+                msg = getText(R.string.pref_dialog_screen_lock_message) as String
+            }
+            screenLockManager.show(msg){
+                sendBroadcastEvent(SCREEN_LOCK_DIALOG_CANCELLED_EVENT, intent.extras)
             }
-            screenLockManager.show(msg)
         }
 
         AA_EDIT_PREF_SCREEN -> navigateToPreferencesScreen("pref.aa")
@@ -231,8 +236,6 @@ internal fun MainActivity.receive(intent: Intent?) {
                         PorterDuff.Mode.SRC_IN,
                     )
             }
-
-            toast(org.obd.graphs.commons.R.string.main_activity_toast_connection_connecting)
         }
 
         PREFS_CONNECTION_TYPE_CHANGED_EVENT -> updateAdapterConnectionType()
diff --git a/app/src/main/java/org/obd/graphs/activity/ScreenLockManager.kt b/app/src/main/java/org/obd/graphs/activity/ScreenLockManager.kt
index ee0171b2..d0033447 100644
--- a/app/src/main/java/org/obd/graphs/activity/ScreenLockManager.kt
+++ b/app/src/main/java/org/obd/graphs/activity/ScreenLockManager.kt
@@ -23,7 +23,6 @@ import android.os.Looper
 import android.view.View
 import android.widget.Button
 import android.widget.TextView
-import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -47,8 +46,8 @@ import org.obd.graphs.ui.common.toast
             val cancelButton = dialogView.findViewById<Button>(R.id.dialog_screen_lock_cancel_btn)
 
             cancelButton.setOnClickListener {
-                dismiss()
                 onCancelAction?.invoke()
+                dismiss()
             }
 
             setView(dialogView)
@@ -80,7 +79,7 @@ import org.obd.graphs.ui.common.toast
             timeoutRunnable =
                 Runnable {
                     if (lockScreenDialog?.isShowing == true) {
-                        toast(R.string.dialog_screen_lock_timeout_message)
+                        toast(R.string.pref_dialog_screen_lock_timeout_message)
                         dismiss()
                     }
                 }
diff --git a/app/src/main/java/org/obd/graphs/ui/Extensions.kt b/app/src/main/java/org/obd/graphs/ui/Extensions.kt
index 249d5c3d..5bc7a339 100644
--- a/app/src/main/java/org/obd/graphs/ui/Extensions.kt
+++ b/app/src/main/java/org/obd/graphs/ui/Extensions.kt
@@ -21,12 +21,17 @@ import androidx.activity.ComponentActivity
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
+import org.obd.graphs.CONTEXT_EXTRA_PARAM_NAME
+import org.obd.graphs.MSG_EXTRA_PARAM_NAME
+import org.obd.graphs.R
+import org.obd.graphs.SCREEN_LOCK_PROGRESS_EVENT
 import org.obd.graphs.activity.FabButtons
 import org.obd.graphs.bl.datalogger.DataLoggerRepository
 import org.obd.graphs.bl.datalogger.DataLoggerService
 import org.obd.graphs.bl.query.Query
+import org.obd.graphs.sendBroadcastEvent
 
-fun DialogFragment.withDataLogger(action: DataLoggerService.() -> Unit) {
+ fun DialogFragment.withDataLogger(action: DataLoggerService.() -> Unit) {
     org.obd.graphs.bl.datalogger
         .withDataLogger(requireContext(), action)
 }
@@ -52,6 +57,10 @@ fun Fragment.configureActionButton(query: Query) {
                     stop()
                 }
             } else {
+                sendBroadcastEvent(SCREEN_LOCK_PROGRESS_EVENT,
+                    mapOf(
+                        MSG_EXTRA_PARAM_NAME to getText(R.string.pref_dialog_screen_lock_logger_connect_message) as String,
+                        CONTEXT_EXTRA_PARAM_NAME to "datalogger.connect"))
                 withDataLogger {
                     Log.i("Fragment", "Start data logging")
                     start(query)
diff --git a/app/src/main/java/org/obd/graphs/ui/SurfaceRendererFragment.kt b/app/src/main/java/org/obd/graphs/ui/SurfaceRendererFragment.kt
index f41bdf4e..4fe58cba 100644
--- a/app/src/main/java/org/obd/graphs/ui/SurfaceRendererFragment.kt
+++ b/app/src/main/java/org/obd/graphs/ui/SurfaceRendererFragment.kt
@@ -34,6 +34,7 @@ import androidx.fragment.app.Fragment
 import org.obd.graphs.DATA_LOGGER_AUTO_CONNECT_EVENT
 import org.obd.graphs.R
 import org.obd.graphs.RenderingThread
+import org.obd.graphs.SCREEN_LOCK_DIALOG_CANCELLED_EVENT
 import org.obd.graphs.activity.LOG_TAG
 import org.obd.graphs.activity.TOOLBAR_HIDE
 import org.obd.graphs.activity.TOOLBAR_SHOW
@@ -42,6 +43,7 @@ import org.obd.graphs.bl.collector.MetricsCollector
 import org.obd.graphs.bl.datalogger.DATA_LOGGER_CONNECTED_EVENT
 import org.obd.graphs.bl.datalogger.DATA_LOGGER_STOPPED_EVENT
 import org.obd.graphs.bl.datalogger.DataLoggerRepository
+import org.obd.graphs.getContextExtraParam
 import org.obd.graphs.registerReceiver
 import org.obd.graphs.renderer.api.Fps
 import org.obd.graphs.renderer.api.ScreenSettings
@@ -130,6 +132,17 @@ internal abstract class SurfaceRendererFragment(
                 intent: Intent?,
             ) {
                 when (intent?.action) {
+                    SCREEN_LOCK_DIALOG_CANCELLED_EVENT -> {
+                        if (isFragmentVisibleToTheUser()) {
+                            Log.d(LOG_TAG, "User canceled current activity.")
+                            if (intent.getContextExtraParam() == "datalogger.connect") {
+                                withDataLogger {
+                                    stop()
+                                }
+                            }
+                        }
+                    }
+
                     DATA_LOGGER_AUTO_CONNECT_EVENT ->
                         if (isFragmentVisibleToTheUser() && !DataLoggerRepository.isRunning()) {
                             val screenBehavior =
@@ -178,13 +191,19 @@ internal abstract class SurfaceRendererFragment(
         surfaceController.renderFrame()
     }
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
+    override fun onPause() {
+        super.onPause()
+        requireContext().unregisterReceiver(broadcastReceiver)
+    }
+
+    override fun onResume() {
+        super.onResume()
 
         registerReceiver(activity, broadcastReceiver) {
             it.addAction(DATA_LOGGER_CONNECTED_EVENT)
             it.addAction(DATA_LOGGER_STOPPED_EVENT)
             it.addAction(DATA_LOGGER_AUTO_CONNECT_EVENT)
+            it.addAction(SCREEN_LOCK_DIALOG_CANCELLED_EVENT)
         }
     }
 
diff --git a/app/src/main/res/layout/dialog_screen_lock.xml b/app/src/main/res/layout/dialog_screen_lock.xml
index 5d40aafe..7d030ecb 100644
--- a/app/src/main/res/layout/dialog_screen_lock.xml
+++ b/app/src/main/res/layout/dialog_screen_lock.xml
@@ -28,7 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:gravity="center"
-            android:text="@string/dialog.screen.lock.message"
+            android:text="@string/pref.dialog.screen.lock.message"
             android:textColor="@color/gray_dark"
             android:textSize="16sp"
             android:textStyle="bold"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a56d343..b43682cc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,8 +5,9 @@
     <string name="pref.performance.screen_label_y_padding"><b><i>Gauge</i></b> label top offset</string>
     <string name="pref.performance.screen_top_margin">Top margin</string>
 
-    <string name="dialog.screen.lock.timeout_message">Timeout waiting for response</string>
-    <string name="dialog.screen.lock.message">Please wait. This may take a while....</string>
+    <string name="pref.dialog.screen.lock.logger_connect.message">Please wait. Adapter connection may take a while....</string>
+    <string name="pref.dialog.screen.lock.timeout_message">Timeout waiting for response</string>
+    <string name="pref.dialog.screen.lock.message">Please wait. This may take a while....</string>
     <string name="pref.experimental_switch_network_enabled">This is an EXPERIMENTAL feature, controlled by the FF_SWITCH_NETWORK_ENABLED feature flag</string>
     <string name="pref.experimental_result_cache_enabled">This is an EXPERIMENTAL feature, controlled by FF_RESULT_CACHE_ENABLED Feature Flag</string>
     <string name="pref.experimental_read_external_storage_enabled">This is an EXPERIMENTAL feature, controlled by FF_PID_EXTERNAL_STORAGE_ENABLED Feature Flag</string>
diff --git a/common/src/main/java/org/obd/graphs/Broadcast.kt b/common/src/main/java/org/obd/graphs/Broadcast.kt
index 60093bf3..c5429599 100644
--- a/common/src/main/java/org/obd/graphs/Broadcast.kt
+++ b/common/src/main/java/org/obd/graphs/Broadcast.kt
@@ -21,10 +21,46 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Build
+import android.os.Bundle
 
-private const val EXTRA_PARAM_NAME = "extra"
+const val MSG_EXTRA_PARAM_NAME = "default.extra"
+const val CONTEXT_EXTRA_PARAM_NAME = "context.extra"
 
-fun Intent.getExtraParam(): String = extras?.get(EXTRA_PARAM_NAME) as String
+fun Intent.getMessageExtraParam(): String? = extras?.getString(MSG_EXTRA_PARAM_NAME)
+
+fun Intent.getContextExtraParam(): String? = extras?.getString(CONTEXT_EXTRA_PARAM_NAME)
+
+fun sendBroadcastEvent(
+    actionName: String,
+    extras: Map<String, String>,
+) {
+    getContext()?.run {
+        sendBroadcast(
+            Intent().apply {
+                action = actionName
+                extras.forEach { k, v ->
+                    putExtra(k, v)
+                }
+            },
+        )
+    }
+}
+
+fun sendBroadcastEvent(
+    actionName: String,
+    bundle: Bundle?,
+) {
+    getContext()?.run {
+        sendBroadcast(
+            Intent().apply {
+                action = actionName
+                bundle?.let {
+                    putExtras(bundle)
+                }
+            },
+        )
+    }
+}
 
 fun sendBroadcastEvent(
     actionName: String,
@@ -34,7 +70,7 @@ fun sendBroadcastEvent(
         sendBroadcast(
             Intent().apply {
                 action = actionName
-                putExtra(EXTRA_PARAM_NAME, extra)
+                putExtra(MSG_EXTRA_PARAM_NAME, extra)
             },
         )
     }
diff --git a/common/src/main/java/org/obd/graphs/Constants.kt b/common/src/main/java/org/obd/graphs/Constants.kt
index 0e1170a1..0cf42678 100644
--- a/common/src/main/java/org/obd/graphs/Constants.kt
+++ b/common/src/main/java/org/obd/graphs/Constants.kt
@@ -16,8 +16,9 @@
  */
 package org.obd.graphs
 
-const val SCREEN_LOCK_PROGRESS_EVENT = "screen.block.event"
-const val SCREEN_UNLOCK_PROGRESS_EVENT = "screen.unlock.event"
+const val SCREEN_LOCK_DIALOG_CANCELLED_EVENT = "screen.lock.dialog.cancelled.event"
+const val SCREEN_LOCK_PROGRESS_EVENT = "screen.lock.dialog.loc.event"
+const val SCREEN_UNLOCK_PROGRESS_EVENT = "screen.lock.dialog.unlock.event"
 const val AA_EDIT_PREF_SCREEN = "pref.aa.edit"
 
 const val MAIN_ACTIVITY_EVENT_DESTROYED = "main_activity.on_destroy"
diff --git a/datalogger/src/main/java/org/obd/graphs/bl/datalogger/WorkflowOrchestrator.kt b/datalogger/src/main/java/org/obd/graphs/bl/datalogger/WorkflowOrchestrator.kt
index 5167a5f2..8829dd7a 100644
--- a/datalogger/src/main/java/org/obd/graphs/bl/datalogger/WorkflowOrchestrator.kt
+++ b/datalogger/src/main/java/org/obd/graphs/bl/datalogger/WorkflowOrchestrator.kt
@@ -71,8 +71,12 @@ internal class WorkflowOrchestrator internal constructor() {
     private var lifecycle = object : Lifecycle {
 
         override fun onConnecting() {
+            if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
+                Log.d(LOG_TAG, "Received onConnecting event.Start collecting process")
+            }
+
             status = WorkflowStatus.Connecting
-            Log.i(LOG_TAG, "Start collecting process")
+
             sendBroadcastEvent(DATA_LOGGER_CONNECTING_EVENT)
         }
 
@@ -80,6 +84,10 @@ internal class WorkflowOrchestrator internal constructor() {
             dtc: Set<DiagnosticTroubleCode>,
             status: DiagnosticTroubleCodeClearStatus?
         ) {
+            if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
+                Log.d(LOG_TAG, "Received onDTCCompleted event.")
+            }
+
             VehicleCapabilitiesManager.updateDTC(dtc)
             sendBroadcastEvent(DATA_LOGGER_DTC_ACTION_COMPLETED)
         }
@@ -88,7 +96,10 @@ internal class WorkflowOrchestrator internal constructor() {
             routineCommand: RoutineCommand,
             status: RoutineExecutionStatus
         ) {
-            Log.i(LOG_TAG, "Routine: ${routineCommand.pid.description}  execution status: $status")
+            if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
+                Log.d(LOG_TAG, "Received onRoutineCompleted event. Routine: ${routineCommand.pid.description}  execution status: $status")
+            }
+
             val event = when (status) {
                 RoutineExecutionStatus.ERROR -> ROUTINE_EXECUTION_FAILED_EVENT
                 RoutineExecutionStatus.NO_DATA -> ROUTINE_EXECUTION_NO_DATA_RECEIVED_EVENT
@@ -99,26 +110,32 @@ internal class WorkflowOrchestrator internal constructor() {
         }
 
         override fun onRunning(vehicleCapabilities: VehicleCapabilities) {
+            if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
+                Log.d(LOG_TAG, "Received onRunning event. We are connected to the vehicle: $vehicleCapabilities")
+            }
+
+            sendBroadcastEvent(SCREEN_UNLOCK_PROGRESS_EVENT)
             status = WorkflowStatus.Connected
-            Log.i(LOG_TAG, "We are connected to the vehicle: $vehicleCapabilities")
             VehicleCapabilitiesManager.updateCapabilities(vehicleCapabilities)
             sendBroadcastEvent(DATA_LOGGER_CONNECTED_EVENT)
-
             tripManager.startNewTrip(System.currentTimeMillis())
         }
 
         override fun onError(msg: String, tr: Throwable?) {
-            Log.i(
-                LOG_TAG,
-                "An error occurred during interaction with the device. Msg: $msg"
-            )
+            if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
+                Log.d(LOG_TAG, "Received onConnecting event. An error occurred during interaction with the device. Msg: $msg")
+            }
 
-            stop()
+            sendBroadcastEvent(SCREEN_UNLOCK_PROGRESS_EVENT)
             sendBroadcastEvent(DATA_LOGGER_ERROR_EVENT)
+            stop()
         }
 
         override fun onStopped() {
+            sendBroadcastEvent(SCREEN_UNLOCK_PROGRESS_EVENT)
+
             status = WorkflowStatus.Disconnected
+
             Log.i(
                 LOG_TAG,
                 "Collecting process is completed."
@@ -258,8 +275,6 @@ internal class WorkflowOrchestrator internal constructor() {
 
     private lateinit var currentQuery: Query
 
-    fun getCurrentQuery(): Query? = if (::currentQuery.isInitialized) currentQuery else null
-
     fun updateQuery(query: Query) {
         if (isSameQuery(query)) {
             Log.w(LOG_TAG, "Received same query=${query.getIDs()}. Do not update.")