Merge "Add assert for zero_motion_factor range"