Merge "Move primary-split-screen stack forward in some cases."