Merge "Fix back to split pair from overview with shell-transition hang."