Merge "Greylist camera API used by CameraITS test" into pi-dev