Merge "Non-functionally simplify InfoMediaManager and mark nullability" into main