Merge "CameraITS: fix commented out assert" into pi-dev