Merge "ActiveModeWarden: Don't allow STA + STA for older apps" into sc-dev