Merge "remove video editor from media_profiles.xml" into mnc-dev