Fixed Possible Resolver Infinite Loop

There was a possibility in the case where the ApplicationSuggestions
are being used and the Resolver isn't replaced that an infinite loop
of the resolver starting itself up and finishing its current instance
would happen.  This will fix this case by no returning the Resolver
in the query if we aren't currently using a Custom Resolver.

This means that any custom resolver used needs to handle the case where
it gets returned a reference to itself when there are no other activities
to handle the intent otherwise.

Change-Id: I559a188f5011445e4ba91738b30d7ed367398406
(cherry picked from commit 3c4710a0)
Issue-Id: CYNGNOS-1151