Merge "Cleanup flag: sms_domain_selection_enabled" into main