Merge "Fix frame size issue with 64-bit"