Merge "Do not increment the conversation unread count when FLAG_ONLY_ALERT_ONCE is set." into sc-dev