Merge "remove video editor from MediaProfile" into mnc-dev