DO NOT MERGE - Prevent "add-call" UI during setup wizard. am: 3217d389dc am: 44d7f8e340 am: 9f236fe2ef  -s ours am: 9e990077cf am: 3b38745e64  -s ours am: 15e5f17f4a am: 3ab30dcea3 am: 2b980f0bf7  -s ours am: 79d9693c91 am: 82b62512d4
am: bbba3ca649

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