CBL-6023 : Sometimes query becomes nil before is stopped

[pasin]

• Make sure the query is retained and not nil when using it.

• Port the fix from releae/3.2 branch.