Merge "Fixes minimized state to match task and stack bounds for cts test"