Merge changes Ide2ea08f,I24186745

* changes:
  Rollback Broadcast in-call UI changes.
  Fix NPE crash on video call.