Merge "CameraITS: make lens shading check more robust" into nyc-dev