Merge "Fix a couple of issues in the media_profiles"