Merge "NotifGroupManager: Add 'Legacy' to log tag" into tm-dev