Cleanup in BackgroundPhotoService
Adding code for no preview picture taking, needs testing