Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca
automerge: 11c4cc1

* commit '11c4cc196de9dca3bfad711b1b9e4b779a72cc01':
  Only hide cross profile disclosure when showing resolver.