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