Merge "Fix reopen recent app test logic on large screen" into main