Merge "Camera: stop streaming before deleting jpeg stream" into pi-dev