Revert "main: Only restore key focus on pop when modal actor is still focused"
This one caused a regression and now keys appear to get stuck while raising the screenShield, so revert it. Hopefully we can fix the original problem in a better way next cycle by tracking key focus changes internally in ClutterGrab.
This reverts commit 4d544d7b.