Merge "hal: Update to make code more reliable" into av-userspace.lnx.2.0-dev