Merge "Reset FPU state after calc_plane_error()"