Merge "MediaPlayer: optimize audio session update" into sc-dev