Merge "Fix a bug that happend when frame size changed between inter frames."