Merge "hal: Fix for memory corruption during Sub System Restart"