Merge "API Cleanup: Remove VideoState class." into mnc-dev