Merge "Fix bug with half-black screen when folding or waking with a SHOW_WHEN_LOCKED app in splitscreen" into main