Merge "Use MV_FP_SIZE based constant instead of 3." into nextgenv2