Merge "Clarify ResolverActivity inheritance contract." into tm-qpr-dev