Merge "add transactional video state APIs" into main