Merge "Fix x_offset_q4/y_offset_q4 calculation"