Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
automerge: c28fa2c

* commit 'c28fa2cdd4692faafc520972b71ddbac1feec4d3':
  Take into account other profiles when deciding whether to show ResolverActivity