Merge "Revert^2: Expand minimized split stack on relaunch-attempt" into rvc-dev am: f996e424 am: 15bee703 am: fd1202c4 Change-Id: Iefa4b8ec6d83b8f28866c9727fc1cacb9e6aa915