Merge "Fix MediaPlayer device-aware session id configuration." into main