Merge "Fix for Media Server memory leak" into honeycomb-mr1