Merge "Support for audio attributes on audio output of media player"