Merge "Correct issues with VideoProvider discovered via CTS tests." into mnc-dev