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