Merge "Take into account other profiles when deciding whether to show...
Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
automerge: c28fa2cd
* commit 'c28fa2cd':
Take into account other profiles when deciding whether to show ResolverActivity