Merge "Small fixes of MediaSession"