Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev