Merge "Fixing null deference crash in audio service"