Merge "hal: Fix test app crash issue"