Merge "Fix resuming with focusable always-on-top stacks"