Merge "Fix sample spacing in lens shading map saved to DNG" into pi-dev