Integrate latest upstream changes into ATEM module.