Merge "Revert "Expand minimized split stack on relaunch-attempt"" into rvc-dev