Merge "Remove dummy surface in CameraSource" into kraken