Merge "Avoid settingslib.widget.preference.radio" into main