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

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