Merge "Refactor badging notification preference controller."