Merge "Improve InfoMediaManager javadoc" into main