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

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