CountryListSpinner does not set the selected CountryInfo

Firebase Auth-UI sign-in with phone number has an issue as the CountryListSpinner does not provider the actual selected CountryInfo via method getSelectedCountryInfo().
I've checked the code an there is a small change required:

    mListPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
        @Override
        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
            CountryInfo info = mCountryListAdapter.getItem(position);
            if (info != null) {
                mSelectedCountryInfo = info; // This needs to be added in order to set the selected country info 
                setText(info.toShortString());
            }

            onUnfocus();
        }
    });

Please check, "mSelectedCountryInfo = info;" needs to be set as commented above.
Please update, as phone number authentication is not working in version 8.0.0 due to missing country code.