Merge "Use audio focus instead of legacy music command"