Merge "Fix mediaserver crash issue"