Merge "hal: Increase Deep buffer buffering"