Merge "Camera: clarify lens shading map" into nyc-dev