Unexpected jump back to watch face when button pressed

Verification

• I searched for similar bug reports (including closed issues) and found none was relevant.

What happened?

Irrespective of where you are in the menu system, pressing the button takes you back to the watch face

What should happen instead?

Irrespective of where you are in the menu system, pressing the button takes you back to the screen you were previously on

Reproduction steps

Set display timeout to 5 seconds or the below will take a while to run through.

Now navigate to a screen deep in the menu (eg About). Press the button and the screen jumps back to the previous, list of settings you can change.

Loop 10 times:
Turn the watch on by pressing the button
Watch face appears
Swipe to the Settings screen
Wait for the watch to turn the display off
/ Loop

Now navigate to a screen deep in the menu (eg About). Press the button and the screen jumps back to your watch face.

Note that I also got to this state by Swiping to the Notifications screen and letting the watch turn the display off.
It looks like on the 8th loop, you jump back two screens and the 9th loop you jump back to the watch face. 10 loops it to make sure you get to the "bad" state.

More details?

the appStack is getting filled up because the previous screen is not popped off the appStack if the display goes to sleep when you are on the settings or navigation screens.

Version

V1.16.1

Companion app

Gadegetbridge 0.89.1

Reproduce the repeated sleep-and-wake sequence through Settings or Notifications, then trace how appStack is handled when the display sleeps on those screens. The fix is complete when pressing the button returns to the previously displayed screen rather than skipping back through multiple screens or reaching the watch face.