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