Merge "Remove unused flag - ap_domain_selection_enabled" into main