Merge "Revert ResolverActivity changes associated with browseables." into rvc-dev