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

* commit '3458e180cf1dab2be19d00758b64033061aa62d2':
  Only hide cross profile disclosure when showing resolver.