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

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