Merge "Cleaning up full_pixel_search()."