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

Change-Id: I52cad0a073b44c446522c3d6fa8d3db2bd264273