Merge "Code clean of sub_pixel_variance4xh -- 2"