Merge "Set the right reportNextDraw" into mnc-dev