Merge "Fix notification dot not always being up to date." into sc-dev