DO NOT MERGE - Prevent "add-call" UI during setup wizard. am: 3217d389dc am: 44d7f8e340 am: 9f236fe2ef  -s ours
am: 9e990077cf

* commit '9e990077cf564b9ec73d59fe4b8357eafdc7ecc9':
  DO NOT MERGE - Prevent "add-call" UI during setup wizard.