Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev