Merge "AudioSystem: Fix null check"