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

* commit '06ab0ca4812450ec297722957e18b34cbfa733b2':
  Only hide cross profile disclosure when showing resolver.