Merge "Remove lock delay on exiting edit mode activity" into main

    private var shouldOpenWidgetPickerOnStart = false

    private var lockOnDestroy = false

    private val addWidgetActivityLauncher: ActivityResultLauncher<Intent> =

        registerForActivityResult(StartActivityForResult()) { result ->

            when (result.resultCode) {

                                run { Log.w(TAG, "No AppWidgetProviderInfo found in result.") }

                            }

                        }

                    }

                        ?: run { Log.w(TAG, "No data in result.") }

                    } ?: run { Log.w(TAG, "No data in result.") }

                }

                else ->

                    Log.w(

            // Wait for the current scene to be idle on communal.

            communalViewModel.isIdleOnCommunal.first { it }

            // Then finish the activity (this helps to avoid a flash of lockscreen when locking

            // in onDestroy()).

            lockOnDestroy = true

            // Lock to go back to the hub after exiting.

            lockNow()

            finish()

        }

    }

    override fun onDestroy() {

        super.onDestroy()

        communalViewModel.setEditModeOpen(false)

        if (lockOnDestroy) lockNow()

    }

    private fun lockNow() {