Merge pull request #5218 from lioncash/video VideoConfigDiag: Move event implementations into the cpp file