Merge "Fix NullPointerException in VideoCallImpl." into m-wireless-dev