Finish activity before reveal if not setup.
automerge: c5722b4

* commit 'c5722b4638a4807a3accbd85822eeb7c09973c44':
  Finish activity before reveal if not setup.
tree: 1e9f513ae32d9dd4623d368b4999151c6c9a39dc
  1. InCallUI/