Merge "Don't create recovery snapshot until it contains at least one key." into pi-dev