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

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