Merge "Clean up deprecated RadioButtonPreference" into main