Implementations and fixes for the MediaManager