Merge "Change default EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK to true"