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

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