Merge "MB_MODE_INFO size reduction"