Mac Mini M1 Screen Saver Coming On While Disabled and Computer in Use

I just got through my migration today from my iMac 23" to a brand new Mac Mini M1. The screen saver is coming on while the computer is in use and/or before the display goes blank. The screen saver is unresponsive to key strokes. I did some hunting and found that we can force the login screen with CTRL-SHIFT-EJECT. Screen sleep is set for 15 minutes and screen saver is set for never. I have noted some other reports from MacBook M1 users with the same issue - is there a fix coming? Is there anything we can do as a workaround? This is a frustrating issue. The only "solution" I've found is the multi key stroke login window thing noted above.