Merge "set-account command: Do not close ReviewDb that was injected" into stable-2.5