Merge "Remove MediaManager and push down callbacks to InfoMediaManager" into main