Merge "Fix notification count showing on 1x1" into sc-dev