Merge "Always highlight unread count" into sc-dev