Merge "Fix log spam for media.log" into oc-dev