Merge "[wm]: Move split-secondary stack to front when split-screen is dismissed"