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