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