Merge "ActiveModeWarden: Only call setMultiStaPrimaryConnection if a primary exists" into sc-dev