Merge "Revert^2: Expand minimized split stack on relaunch-attempt" into rvc-dev am: f996e4240d

Change-Id: Id4ee948e7431175db434c1edded2e162efb219d2