[odin beta] Regression: black screen after locking and unlocking multiple monitors

## What Happened
I installed the beta on my laptop to test if this Elementary 5 bug was resolved. When I lock the screen manually or let it lock by timeout and try to unlock it, it will show a black screen with a pointer, no desktop. If I don't have the external monitor connected, it works fine This seems the same bug I've had since v 5.0

## Expected Behavior
The screen should unlock and show the desktop

## Steps to Reproduce

1. install v6
2.connect an external monitor (over hdmi in my case
3.Lock the screen
4. unlock the screen

### Logs

## Platform Information
Elementary 6.0 beta, updated to 2021-06-04

lshw:
faith
description: Notebook
product: MACH-WX9 (C199)
vendor: HUAWEI
version: M14
serial: EHUBB19513000144
width: 64 bits
capabilities: smbios-3.0.0 dmi-3.0.0 smp vsyscall32
configuration: administrator_password=enabled boot=normal chassis=notebook family=MateBook X sku=C199 uuid=14051920-63F4-E41F-D0FC-F4631FE4D100
*-core
description: Motherboard
product: MACH-WX9-PCB
vendor: HUAWEI
physical id: 0
version: M14
serial: BB8312193K000263
*-firmware
description: BIOS
vendor: HUAWEI
physical id: 0
version: 1.25
date: 12/15/2018
size: 128KiB
capacity: 8MiB
capabilities: pci pnp upgrade shadowing cdboot bootselect edd acpi usb smartbattery biosbootspecification uefi
*-cpu
description: CPU
product: Intel(R) Core(TM) i7-8550U CPU @ 1.80GHz
vendor: Intel Corp.
physical id: 4
bus info: cpu@0
version: Intel(R) Core(TM) i7-8550U CPU @ 1.80GHz
serial: NULL
slot: CPU0
size: 1764MHz
capacity: 4005MHz
width: 64 bits
clock: 100MHz
capabilities: lm fpu fpu_exception wp vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp x86-64 constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d cpufreq
configuration: cores=4 enabledcores=4 threads=8
*-cache:0
description: L1 cache
physical id: 5
slot: L1 Cache
size: 256KiB
capacity: 256KiB
capabilities: synchronous internal write-back unified
configuration: level=1
*-cache:1
description: L2 cache
physical id: 6
slot: L2 Cache
size: 1MiB
capacity: 1MiB
capabilities: synchronous internal write-back unified
configuration: level=2
*-cache:2
description: L3 cache
physical id: 7
slot: L3 Cache
size: 8MiB
capacity: 8MiB
capabilities: synchronous internal write-back unified
configuration: level=3
*-memory
description: System Memory
physical id: 25
slot: System board or motherboard
size: 16GiB
*-bank:0
description: Row of chips LPDDR3 Synchronous Unbuffered (Unregistered) 2133 MHz (0.5 ns)
product: K4EBE304EB-EGCG
vendor: Samsung
physical id: 0
serial: 55000000
slot: ChannelA-DIMM0
size: 8GiB
width: 64 bits
clock: 2133MHz (0.5ns)
*-bank:1
description: Row of chips LPDDR3 Synchronous Unbuffered (Unregistered) 2133 MHz (0.5 ns)
product: K4EBE304EB-EGCG
vendor: Samsung
physical id: 1
serial: 55000000
slot: ChannelB-DIMM0
size: 8GiB
width: 64 bits
clock: 2133MHz (0.5ns)
*-pci
description: Host bridge
product: Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
vendor: Intel Corporation
physical id: 100
bus info: pci@0000:00:00.0
version: 08
width: 32 bits
clock: 33MHz
configuration: driver=skl_uncore
resources: irq:0
*-display
description: VGA compatible controller
product: UHD Graphics 620
vendor: Intel Corporation
physical id: 2
bus info: pci@0000:00:02.0
logical name: /dev/fb0
version: 07
width: 64 bits
clock: 33MHz
capabilities: pciexpress msi pm vga_controller bus_master cap_list rom fb
configuration: depth=32 driver=i915 latency=0 mode=3000x2000 visual=truecolor xres=3000 yres=2000
resources: iomemory:2f0-2ef iomemory:2f0-2ef irq:137 memory:2ff2000000-2ff2ffffff memory:2fc0000000-2fcfffffff ioport:4000(size=64) memory:c0000-dffff
*-generic:0
description: Signal processing controller
product: Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem
vendor: Intel Corporation
physical id: 4
bus info: pci@0000:00:04.0
version: 08
width: 64 bits
clock: 33MHz
capabilities: msi pm bus_master cap_list
configuration: driver=proc_thermal latency=0
resources: iomemory:2f0-2ef irq:16 memory:2ff3010000-2ff3017fff
*-usb
description: USB controller
product: Sunrise Point-LP USB 3.0 xHCI Controller
vendor: Intel Corporation
physical id: 14
bus info: pci@0000:00:14.0
version: 21
width: 64 bits
clock: 33MHz
capabilities: pm msi xhci bus_master cap_list
configuration: driver=xhci_hcd latency=0
resources: irq:127 memory:93200000-9320ffff
*-usbhost:0
product: xHCI Host Controller
vendor: Linux 5.8.0-53-generic xhci-hcd
physical id: 0
bus info: usb@1
logical name: usb1
version: 5.08
capabilities: usb-2.00
configuration: driver=hub slots=12 speed=480Mbit/s
*-usb:0
description: USB hub
product: USB2.0 Hub
vendor: VIA Labs, Inc.
physical id: 1
bus info: usb@1:1
version: 4.73
capabilities: usb-2.10
configuration: driver=hub slots=5 speed=480Mbit/s
*-usb:0 UNCLAIMED
description: Generic USB device
product: USB 2.0 BILLBOARD
vendor: VIA Technologies Inc.
physical id: 1
bus info: usb@1:1.1
version: 13.24
serial: 0000000000000001
capabilities: usb-2.01
configuration: speed=480Mbit/s
*-usb:1
description: USB hub
product: 4-Port USB 2.0 Hub
vendor: Generic
physical id: 2
bus info: usb@1:1.2
version: 1.04
capabilities: usb-2.10
configuration: driver=hub slots=4 speed=480Mbit/s
*-usb
description: Keyboard
product: USB Receiver
vendor: Logitech
physical id: 4
bus info: usb@1:1.2.4
version: 24.11
capabilities: usb-2.00
configuration: driver=usbhid maxpower=98mA speed=12Mbit/s
*-usb:2 UNCLAIMED
description: Generic USB device
product: USB Billboard Device
vendor: VIA Labs, Inc.
physical id: 5
bus info: usb@1:1.5
version: 0.01
serial: 0000000000000001
capabilities: usb-2.01
configuration: maxpower=100mA speed=480Mbit/s
*-usb:1
description: Bluetooth wireless interface
vendor: Intel Corp.
physical id: 5
bus info: usb@1:5
version: 0.10
capabilities: bluetooth usb-2.00
configuration: driver=btusb maxpower=100mA speed=12Mbit/s
*-usb:2
description: Video
product: HD Camera
vendor: SunplusIT Inc
physical id: 7
bus info: usb@1:7
version: 0.12
capabilities: usb-2.01
configuration: driver=uvcvideo maxpower=500mA speed=480Mbit/s
*-usbhost:1
product: xHCI Host Controller
vendor: Linux 5.8.0-53-generic xhci-hcd
physical id: 1
bus info: usb@2
logical name: usb2
version: 5.08
capabilities: usb-3.00
configuration: driver=hub slots=6 speed=5000Mbit/s
*-usb
description: USB hub
product: USB3.0 Hub
vendor: VIA Labs, Inc.
physical id: 1
bus info: usb@2:1
version: 4.73
capabilities: usb-3.10
configuration: driver=hub slots=4 speed=5000Mbit/s
*-usb:0
description: USB hub
product: 4-Port USB 3.0 Hub
vendor: Generic
physical id: 2
bus info: usb@2:1.2
version: 1.04
capabilities: usb-3.00
configuration: driver=hub slots=4 speed=5000Mbit/s
*-usb
description: Generic USB device
product: USB 10/100/1000 LAN
vendor: Realtek
physical id: 1
bus info: usb@2:1.2.1
version: 31.00
serial: 001000001
capabilities: usb-3.00
configuration: driver=r8152 maxpower=288mA speed=5000Mbit/s
*-usb:1
description: Mass storage device
product: USB3.0 Card Reader
vendor: Generic
physical id: 4
bus info: usb@2:1.4
version: 15.39
serial: 000000001539
capabilities: usb-3.20 scsi
configuration: driver=usb-storage maxpower=896mA speed=5000Mbit/s
*-generic:1
description: Signal processing controller
product: Sunrise Point-LP Thermal subsystem
vendor: Intel Corporation
physical id: 14.2
bus info: pci@0000:00:14.2
version: 21
width: 64 bits
clock: 33MHz
capabilities: pm msi bus_master cap_list
configuration: driver=intel_pch_thermal latency=0
resources: iomemory:2f0-2ef irq:18 memory:2ff3022000-2ff3022fff
*-generic:2
description: Signal processing controller
product: Sunrise Point-LP Serial IO I2C Controller #0
vendor: Intel Corporation
physical id: 15
bus info: pci@0000:00:15.0
version: 21
width: 64 bits
clock: 33MHz
capabilities: pm bus_master cap_list
configuration: driver=intel-lpss latency=0
resources: iomemory:2f0-2ef irq:16 memory:2ff3021000-2ff3021fff
*-generic:3
description: Signal processing controller
product: Sunrise Point-LP Serial IO I2C Controller #1
vendor: Intel Corporation
physical id: 15.1
bus info: pci@0000:00:15.1
version: 21
width: 64 bits
clock: 33MHz
capabilities: pm bus_master cap_list
configuration: driver=intel-lpss latency=0
resources: iomemory:2f0-2ef irq:17 memory:2ff3020000-2ff3020fff
*-communication
description: Communication controller
product: Sunrise Point-LP CSME HECI #1
vendor: Intel Corporation
physical id: 16
bus info: pci@0000:00:16.0
version: 21
width: 64 bits
clock: 33MHz
capabilities: pm msi bus_master cap_list
configuration: driver=mei_me latency=0
resources: iomemory:2f0-2ef irq:141 memory:2ff301f000-2ff301ffff
*-pci:0
description: PCI bridge
product: Sunrise Point-LP PCI Express Root Port #1
vendor: Intel Corporation
physical id: 1c
bus info: pci@0000:00:1c.0
version: f1
width: 32 bits
clock: 33MHz
capabilities: pci pciexpress msi pm normal_decode bus_master cap_list
configuration: driver=pcieport
resources: irq:122 ioport:3000(size=4096) memory:92000000-92ffffff ioport:80000000(size=301989888)
*-display
description: 3D controller
product: GP108M [GeForce MX150]
vendor: NVIDIA Corporation
physical id: 0
bus info: pci@0000:01:00.0
version: a1
width: 64 bits
clock: 33MHz
capabilities: pm msi pciexpress bus_master cap_list
configuration: driver=nouveau latency=0
resources: irq:138 memory:92000000-92ffffff memory:80000000-8fffffff memory:90000000-91ffffff ioport:3000(size=128)
*-pci:1
description: PCI bridge
product: Sunrise Point-LP PCI Express Root Port #5
vendor: Intel Corporation
physical id: 1c.4
bus info: pci@0000:00:1c.4
version: f1
width: 32 bits
clock: 33MHz
capabilities: pci pciexpress msi pm normal_decode bus_master cap_list
configuration: driver=pcieport
resources: irq:123 memory:93100000-931fffff
*-storage
description: Non-Volatile memory controller
product: Toshiba Corporation
vendor: Toshiba Corporation
physical id: 0
bus info: pci@0000:02:00.0
version: 00
width: 64 bits
clock: 33MHz
capabilities: storage pciexpress pm msi msix nvm_express bus_master cap_list
configuration: driver=nvme latency=0
resources: irq:16 memory:93100000-93103fff
*-nvme0
description: NVMe device
product: KXG50ZNV512G TOSHIBA
physical id: 0
logical name: /dev/nvme0
version: AAXA4103
serial: Z8AB106MK5SS
configuration: nqn=nqn.2017-03.jp.co.toshiba:KXG50ZNV512G TOSHIBA:Z8AB106MK5SS state=live
*-namespace
description: NVMe namespace
physical id: 1
logical name: /dev/nvme0n1
size: 476GiB (512GB)
capabilities: gpt-1.00 partitioned partitioned:gpt
configuration: guid=c8b19dea-cdea-43fb-9346-9024479c26cb logicalsectorsize=512 sectorsize=512
*-volume:0 UNCLAIMED
description: Windows FAT volume
vendor: mkfs.fat
physical id: 1
version: FAT32
serial: c0b2-2924
size: 510MiB
capacity: 511MiB
capabilities: boot fat initialized
configuration: FATs=2 filesystem=fat name=NO NAME
*-volume:1
description: EXT4 volume
vendor: Linux
physical id: 2
logical name: /dev/nvme0n1p2
logical name: /
version: 1.0
serial: 928c1968-b70b-449e-8c89-09eae2ad687b
size: 74GiB
capacity: 74GiB
capabilities: journaled extended_attributes large_files huge_files dir_nlink recover 64bit extents ext4 ext2 initialized
configuration: created=2021-06-04 14:02:33 filesystem=ext4 lastmountpoint=/ modified=2021-06-04 19:45:09 mount.fstype=ext4 mount.options=rw,noatime,errors=remount-ro mounted=2021-06-04 19:45:10 state=mounted
*-volume:2
description: EFI partition
physical id: 3
logical name: /dev/nvme0n1p3
logical name: /data
logical name: /home
serial: 8ec78e9a-6dd2-49ff-a7b2-5f3a4d88b951
capacity: 401GiB
configuration: mount.fstype=btrfs mount.options=rw,relatime,ssd,space_cache,subvolid=5,subvol=/ state=mounted
*-pci:2
description: PCI bridge
product: Sunrise Point-LP PCI Express Root Port #9
vendor: Intel Corporation
physical id: 1d
bus info: pci@0000:00:1d.0
version: f1
width: 32 bits
clock: 33MHz
capabilities: pci pciexpress msi pm normal_decode bus_master cap_list
configuration: driver=pcieport
resources: irq:124 ioport:5000(size=4096) memory:94000000-aa0fffff ioport:2fd0000000(size=570425344)
*-pci:3
description: PCI bridge
product: Sunrise Point-LP PCI Express Root Port #11
vendor: Intel Corporation
physical id: 1d.2
bus info: pci@0000:00:1d.2
version: f1
width: 32 bits
clock: 33MHz
capabilities: pci pciexpress msi pm normal_decode bus_master cap_list
configuration: driver=pcieport
resources: irq:125 memory:93000000-930fffff
*-network
description: Wireless interface
product: Wireless 8265 / 8275
vendor: Intel Corporation
physical id: 0
bus info: pci@0000:3c:00.0
logical name: wlp60s0
version: 78
serial: f4:63:1f:e4:d0:fc
width: 64 bits
clock: 33MHz
capabilities: pm msi pciexpress bus_master cap_list ethernet physical wireless
configuration: broadcast=yes driver=iwlwifi driverversion=5.8.0-53-generic firmware=36.77d01142.0 8265-36.ucode ip=10.255.255.205 latency=0 link=yes multicast=yes wireless=IEEE 802.11
resources: irq:142 memory:93000000-93001fff
*-generic:4
description: Signal processing controller
product: Sunrise Point-LP Serial IO UART Controller #0
vendor: Intel Corporation
physical id: 1e
bus info: pci@0000:00:1e.0
version: 21
width: 64 bits
clock: 33MHz
capabilities: pm bus_master cap_list
configuration: driver=intel-lpss latency=0
resources: iomemory:2f0-2ef irq:20 memory:2ff301e000-2ff301efff
*-generic:5
description: Signal processing controller
product: Sunrise Point-LP Serial IO SPI Controller #1
vendor: Intel Corporation
physical id: 1e.3
bus info: pci@0000:00:1e.3
version: 21
width: 64 bits
clock: 33MHz
capabilities: pm bus_master cap_list
configuration: driver=intel-lpss latency=0
resources: iomemory:2f0-2ef irq:23 memory:2ff301d000-2ff301dfff
*-isa
description: ISA bridge
product: Sunrise Point LPC Controller/eSPI Controller
vendor: Intel Corporation
physical id: 1f
bus info: pci@0000:00:1f.0
version: 21
width: 32 bits
clock: 33MHz
capabilities: isa bus_master
configuration: latency=0
*-memory UNCLAIMED
description: Memory controller
product: Sunrise Point-LP PMC
vendor: Intel Corporation
physical id: 1f.2
bus info: pci@0000:00:1f.2
version: 21
width: 32 bits
clock: 33MHz (30.3ns)
capabilities: bus_master
configuration: latency=0
resources: memory:93210000-93213fff
*-multimedia
description: Audio device
product: Sunrise Point-LP HD Audio
vendor: Intel Corporation
physical id: 1f.3
bus info: pci@0000:00:1f.3
version: 21
width: 64 bits
clock: 33MHz
capabilities: pm msi bus_master cap_list
configuration: driver=snd_hda_intel latency=32
resources: iomemory:2f0-2ef iomemory:2f0-2ef irq:143 memory:2ff3018000-2ff301bfff memory:2ff3000000-2ff300ffff
*-serial
description: SMBus
product: Sunrise Point-LP SMBus
vendor: Intel Corporation
physical id: 1f.4
bus info: pci@0000:00:1f.4
version: 21
width: 64 bits
clock: 33MHz
configuration: driver=i801_smbus latency=0
resources: iomemory:2f0-2ef irq:16 memory:2ff301c000-2ff301c0ff ioport:4040(size=32)
*-pnp00:00
product: PnP device PNP0c02
physical id: 1
capabilities: pnp
configuration: driver=system
*-pnp00:01
product: PnP device PNP0c02
physical id: 2
capabilities: pnp
configuration: driver=system
*-pnp00:02
product: PnP device PNP0c02
physical id: 3
capabilities: pnp
configuration: driver=system
*-pnp00:03
product: PnP device PNP0b00
physical id: 5
capabilities: pnp
configuration: driver=rtc_cmos
*-pnp00:04
product: PnP device INT3f0d
physical id: 6
capabilities: pnp
configuration: driver=system
*-pnp00:05
product: PnP device PNP0303
physical id: 7
capabilities: pnp
configuration: driver=i8042 kbd
*-pnp00:06
product: PnP device PNP0c02
physical id: 8
capabilities: pnp
configuration: driver=system
*-pnp00:07
product: PnP device PNP0c02
physical id: 9
capabilities: pnp
configuration: driver=system
*-scsi
physical id: a
logical name: scsi0
capabilities: emulated scsi-host
configuration: driver=usb-storage
*-disk:0
description: SCSI Disk
product: MassStorageClass
vendor: Generic
physical id: 0.0.0
bus info: scsi@0:0.0.0
logical name: /dev/sda
version: 1539
serial: 000000001539
capabilities: removable
configuration: ansiversion=6 logicalsectorsize=512 sectorsize=512
*-medium
physical id: 0
logical name: /dev/sda
*-disk:1
description: SCSI Disk
product: MassStorageClass
vendor: Generic
physical id: 0.0.1
bus info: scsi@0:0.0.1
logical name: /dev/sdb
version: 1539
serial: 000000001539
capabilities: removable
configuration: ansiversion=6 logicalsectorsize=512 sectorsize=512
*-medium
physical id: 0
logical name: /dev/sdb
*-battery
description: Lithium Ion Battery
product: HB4593R1ECW
vendor: DYNAPACK
physical id: 1
version: 01/11/2019
serial: 234A
slot: Rear cover inside
configuration: voltage=7.6V
*-power UNCLAIMED
description: OEM Define 1
product: OEM Define 5
vendor: OEM Define 2
physical id: 2
version: OEM Define 6
serial: OEM Define 3
capacity: 75mWh
*-network
description: Ethernet interface
physical id: 3
bus info: usb@2:1.2.1
logical name: enx4865ee16553d
serial: 48:65:ee:16:55:3d
size: 10Mbit/s
capacity: 1Gbit/s
capabilities: ethernet physical tp mii 10bt 10bt-fd 100bt 100bt-fd 1000bt 1000bt-fd autonegotiation
configuration: autonegotiation=on broadcast=yes driver=r8152 driverversion=v1.11.11 duplex=half firmware=rtl8153b-2 v1 10/23/19 link=no multicast=yes port=MII speed=10Mbit/s