Merge "Revert "Fix VIP conversations alerting incorrectly."" into sc-dev