Merge "Enable auto select only when set by Carriers"