Merge "Remove code which prevents making a video call when one is in progress." into mm-wireless-dev