Merge "Update supported media formats doc for ICS"