Merge "More video related API fixes" into mnc-dev